feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CMake: Use better value to initialize executable of RunConfiguration

Browse Source 
Task-number: QTCREATORBUG-19792
Change-Id: Iacf72c71c65ffcfb3a46ca985424806a1d75f1cf
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Tobias Hunger
2018-04-24 16:19:38 +02:00
parent b5ee2773a0
commit a14de75217
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp
View File

@@ -99,8 +99,7 @@ Runnable CMakeRunConfiguration::runnable() const
QString CMakeRunConfiguration::baseWorkingDirectory() const QString CMakeRunConfiguration::baseWorkingDirectory() const
{ {
const QString exe = m_executable; if (!m_executable.isEmpty())
if (!exe.isEmpty())
return QFileInfo(m_executable).absolutePath(); return QFileInfo(m_executable).absolutePath();
return QString(); return QString();
} }
@@ -137,12 +136,12 @@ bool CMakeRunConfiguration::fromMap(const QVariantMap &map)
if (!extraId.isEmpty()) { if (!extraId.isEmpty()) {
m_buildSystemTarget = extraId; m_buildSystemTarget = extraId;
m_executable = extraId;
if (m_title.isEmpty()) if (m_title.isEmpty())
m_title = extraId; m_title = extraId;
CMakeProject *project = static_cast<CMakeProject *>(target()->project()); 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); extraAspect<WorkingDirectoryAspect>()->setDefaultWorkingDirectory(ct.workingDirectory);
setDefaultDisplayName(m_title); setDefaultDisplayName(m_title);