Qt4: Find complete arguments passed to qmake

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>

diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 466586b..47512b7 100644 (file)
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -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;