diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp index 67c525a1db05da6dcf00233fa95826e4806abe99..c1a1f3be251892ab15a6005fba27f1397c18643d 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp @@ -484,6 +484,15 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory) return false; } +QStringList Qt4BuildConfiguration::removeQMLInspectorFromArgumentList(const QStringList &old) +{ + QStringList result; + foreach (const QString &str, old) + if (!str.startsWith(QLatin1String(Constants::QMAKEVAR_QMLINSPECTOR_PATH))) + result << str; + return result; +} + // We match -spec and -platfrom separetly // We ignore -cache, because qmake contained a bug that it didn't // mention the -cache in the Makefile diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.h b/src/plugins/qt4projectmanager/qt4buildconfiguration.h index e9fea9889556084c14af2918fb1d0422cf25dcd6..2b2ac67fc37bbeb1e49a21077e01703188ebec34 100644 --- a/src/plugins/qt4projectmanager/qt4buildconfiguration.h +++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.h @@ -101,6 +101,7 @@ public: QString defaultMakeTarget() const; bool compareToImportFrom(const QString &workingDirectory); + static QStringList removeQMLInspectorFromArgumentList(const QStringList &old); static QStringList removeSpecFromArgumentList(const QStringList &old); static QString extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version); diff --git a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp index d861dd2eee0fbf7eea59bd21cdf5135d7cb9ba4d..a2ae1a231c4274c747b9b86931855514b7305038 100644 --- a/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp +++ b/src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp @@ -402,6 +402,8 @@ void Qt4ProjectConfigWidget::importLabelClicked() additionalArguments.prepend("-spec"); } + additionalArguments = Qt4BuildConfiguration::removeQMLInspectorFromArgumentList(additionalArguments); + // So we got all the information now apply it... m_buildConfiguration->setQtVersion(version);