feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Don't import QMLINSPECTOR_PATH qmake settings.

Browse Source 
Task-Nr: QTCREATORBUG-2209
This commit is contained in:
dt
2010-08-30 13:24:34 +02:00
parent a1e103c28d
commit b68a57b23e
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
View File

@@ -484,6 +484,15 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
return false; 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 match -spec and -platfrom separetly
// We ignore -cache, because qmake contained a bug that it didn't // We ignore -cache, because qmake contained a bug that it didn't
// mention the -cache in the Makefile // mention the -cache in the Makefile

1
src/plugins/qt4projectmanager/qt4buildconfiguration.h
View File

@@ -101,6 +101,7 @@ public:
QString defaultMakeTarget() const; QString defaultMakeTarget() const;
bool compareToImportFrom(const QString &workingDirectory); bool compareToImportFrom(const QString &workingDirectory);
static QStringList removeQMLInspectorFromArgumentList(const QStringList &old);
static QStringList removeSpecFromArgumentList(const QStringList &old); static QStringList removeSpecFromArgumentList(const QStringList &old);
static QString extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version); static QString extractSpecFromArgumentList(const QStringList &list, QString directory, QtVersion *version);

2
src/plugins/qt4projectmanager/qt4projectconfigwidget.cpp
View File

@@ -402,6 +402,8 @@ void Qt4ProjectConfigWidget::importLabelClicked()
additionalArguments.prepend("-spec"); additionalArguments.prepend("-spec");
} }
additionalArguments = Qt4BuildConfiguration::removeQMLInspectorFromArgumentList(additionalArguments);
// So we got all the information now apply it... // So we got all the information now apply it...
m_buildConfiguration->setQtVersion(version); m_buildConfiguration->setQtVersion(version);