From f28dc88e7ab7ab44539f5f2a82569da1c5a384dd Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Tue, 7 Jun 2011 17:09:32 +0200
Subject: [PATCH] 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>
---
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 466586be83b..47512b7cbd1 100644
--- 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;
--
GitLab