From f16339f18d5f09a7348dc636ad6c2d976531347a Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 9 Jun 2017 08:33:33 +0200 Subject: [PATCH] CMakePM: Ensure buildSystemTarget is initialized correctly This ensures the buildSystemTarget will not set to an empty string and not contains path elements. Change-Id: Ib993fb3a64a277490e6596cc0662a781d89a4c49 Reviewed-by: Tobias Hunger --- src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp index 1205953c8b1..bfb4fcbc71f 100644 --- a/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp +++ b/src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp @@ -247,7 +247,7 @@ RunConfiguration *CMakeRunConfigurationFactory::doCreate(Target *parent, Core::I CMakeProject *project = static_cast(parent->project()); const QString title(buildTargetFromId(id)); const CMakeBuildTarget &ct = project->buildTargetForTitle(title); - return new CMakeRunConfiguration(parent, id, ct.executable.toString(), ct.workingDirectory, ct.title); + return new CMakeRunConfiguration(parent, id, title, ct.workingDirectory, ct.title); } bool CMakeRunConfigurationFactory::canClone(Target *parent, RunConfiguration *source) const @@ -274,7 +274,8 @@ bool CMakeRunConfigurationFactory::canRestore(Target *parent, const QVariantMap RunConfiguration *CMakeRunConfigurationFactory::doRestore(Target *parent, const QVariantMap &map) { - return new CMakeRunConfiguration(parent, idFromMap(map), QString(), Utils::FileName(), QString()); + const Core::Id id = idFromMap(map); + return new CMakeRunConfiguration(parent, id, buildTargetFromId(id), Utils::FileName(), QString()); } QString CMakeRunConfigurationFactory::buildTargetFromId(Core::Id id)