From a14de75217eb4aa84a792f89e0ad83ac34c5a6a2 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@qt.io>
Date: Tue, 24 Apr 2018 16:19:38 +0200
Subject: [PATCH] CMake: Use better value to initialize executable of
 RunConfiguration

Task-number: QTCREATORBUG-19792
Change-Id: Iacf72c71c65ffcfb3a46ca985424806a1d75f1cf
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
index 1c79c3a4634..9e234cb123d 100644
--- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
@@ -99,8 +99,7 @@ Runnable CMakeRunConfiguration::runnable() const
 
 QString CMakeRunConfiguration::baseWorkingDirectory() const
 {
-    const QString exe = m_executable;
-    if (!exe.isEmpty())
+    if (!m_executable.isEmpty())
         return QFileInfo(m_executable).absolutePath();
     return QString();
 }
@@ -137,12 +136,12 @@ bool CMakeRunConfiguration::fromMap(const QVariantMap &map)
 
     if (!extraId.isEmpty()) {
         m_buildSystemTarget = extraId;
-        m_executable = extraId;
         if (m_title.isEmpty())
             m_title = extraId;
 
         CMakeProject *project = static_cast<CMakeProject *>(target()->project());
-        const CMakeBuildTarget ct = project->buildTargetForTitle(m_title);
+        const CMakeBuildTarget ct = project->buildTargetForTitle(m_buildSystemTarget);
+        m_executable = ct.executable.toString();
         extraAspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(ct.workingDirectory);
 
         setDefaultDisplayName(m_title);