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

Macro expander: Do not use RunConfiguration::runnable()

Browse Source 
... to get the current executable. That leads to an infinite loop if the
argument or working directory fields reference the
%{CurrentRun:Executable:Path} variable, as these fields also get
evaluated in RunConfiguration::runnable().

Fixes: QTCREATORBUG-18317
Change-Id: Ic249f8ff78d170110947e370045144817b179341
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Kandeler
2019-02-27 14:34:18 +01:00
parent 86e16c9e14
commit f6c276daf0
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/projectexplorer/projectexplorer.cpp
View File

@@ -44,6 +44,7 @@
#include "projectexplorersettingspage.h" #include "projectexplorersettingspage.h"
#include "projectmanager.h" #include "projectmanager.h"
#include "removetaskhandler.h" #include "removetaskhandler.h"
#include "runconfigurationaspects.h"
#include "kitfeatureprovider.h" #include "kitfeatureprovider.h"
#include "kitmanager.h" #include "kitmanager.h"
#include "kitoptionspage.h" #include "kitoptionspage.h"
@@ -1586,8 +1587,14 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
tr("The currently active run configuration's executable (if applicable)."), tr("The currently active run configuration's executable (if applicable)."),
[]() -> QString { []() -> QString {
if (Target *target = activeTarget()) { if (Target *target = activeTarget()) {
if (RunConfiguration *rc = target->activeRunConfiguration()) if (RunConfiguration *rc = target->activeRunConfiguration()) {
return rc->runnable().executable; // TODO: This duplicates code and is not always correct, but see
// QTCREATORBUG-18317.
// Solution: Re-introduce RunConfiguration::executable()?
if (auto executableAspect = rc->aspect<ExecutableAspect>())
return executableAspect->executable().toString();
return QString();
}
} }
return QString(); return QString();
}); });