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

Qmake: Expand variables in the arguments preview

Browse Source 
Change-Id: I422417fbbfa86c39c8a79a593cedd87b208735f4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2017-03-17 00:27:26 +02:00
committed by Orgad Shaneh
parent a96f755be8
commit 98f76ff26f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmakeprojectmanager/qmakestep.cpp
View File

@@ -508,7 +508,7 @@ QString QMakeStep::effectiveQMakeCall() const
QString result = qmake; QString result = qmake;
if (qtVersion) { if (qtVersion) {
result += QLatin1Char(' ') + allArguments(qtVersion); result += ' ' + buildConfiguration()->macroExpander()->expand(allArguments(qtVersion));
if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0)) if (qtVersion->qtVersion() >= QtVersionNumber(5, 0, 0))
result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments())); result.append(QString::fromLatin1(" && %1 %2").arg(make).arg(makeArguments()));
} }