Commit f28dc88e authored by Tobias Hunger's avatar Tobias Hunger
Browse files

Qt4: Find complete arguments passed to qmake

Change-Id: If49183f2d8ed4ad3086dbdbfc20272127be22c25
Reviewed-on: http://codereview.qt.nokia.com/370

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarDaniel Teske <daniel.teske@nokia.com>
parent 3924d99e
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment