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

Qt4: Find complete arguments passed to qmake

Browse Source 
Change-Id: If49183f2d8ed4ad3086dbdbfc20272127be22c25
Reviewed-on: http://codereview.qt.nokia.com/370
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2011-06-07 17:09:32 +02:00
parent 3924d99e71
commit f28dc88e7a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -476,7 +476,12 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &makefile)
// we have to compare without the spec/platform cmd argument
// and compare that on its own
QString workingDirectory = QFileInfo(makefile).absolutePath();
QStringList actualArgs = qs->moreArguments();
QStringList actualArgs;
QString userArgs = qs->userArguments();
// This copies the settings from userArgs to actualArgs (minus some we
// are not interested in), splitting them up into individual strings:
extractSpecFromArguments(&userArgs, workingDirectory, version, &actualArgs),
actualArgs += qs->moreArguments();
QString actualSpec = qs->mkspec();
QString qmakeArgs = result.second;