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

Remove CONFIG+=declarative_debug from imported build line

Browse Source 
Prevent CONFIG+=declarative_debug to show up in "custom arguments"
of an imported build.

Change-Id: Ib598addcb31b65853eea430a086f614c6dd498fd
Reviewed-on: http://codereview.qt.nokia.com/4044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Kai Koehne
2011-09-01 09:43:08 +02:00
committed by Eike Ziller
parent e2e0db687e
commit 14ee91dc54
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -533,9 +533,12 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &makefile)
void Qt4BuildConfiguration::removeQMLInspectorFromArguments(QString *args)
{
for (Utils::QtcProcess::ArgIterator ait(args); ait.next(); )
if (ait.value().contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH)))
for (Utils::QtcProcess::ArgIterator ait(args); ait.next(); ) {
const QString arg = ait.value();
if (arg.contains(QLatin1String(Constants::QMAKEVAR_QMLJSDEBUGGER_PATH))
|| arg.contains(Constants::QMAKEVAR_DECLARATIVE_DEBUG))
ait.deleteArg();
}
}
QString Qt4BuildConfiguration::extractSpecFromArguments(QString *args,