From b68a57b23e3d99ff01e7f3604aeb7b1f988e282d Mon Sep 17 00:00:00 2001
From: dt <qtc-committer@nokia.com>
Date: Mon, 30 Aug 2010 13:24:34 +0200
Subject: [PATCH] Don't import QMLINSPECTOR_PATH qmake settings.
Task-Nr: QTCREATORBUG-2209
---
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 9 +++++++++
src/plugins/qt4projectmanager/qt4buildconfiguration.h | 1 +
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp | 2 ++
3 files changed, 12 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 67c525a1db0..c1a1f3be251 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 e9fea988955..2b2ac67fc37 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 d861dd2eee0..a2ae1a231c4 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);
--
GitLab