forked from qt-creator/qt-creator
Don't import QMLINSPECTOR_PATH qmake settings.
Task-Nr: QTCREATORBUG-2209
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user