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

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

@@ -178,7 +178,7 @@ QStringList QMakeStep::moreArguments()
if (!bc->qtVersion()->needsQmlDebuggingLibrary()) { if (!bc->qtVersion()->needsQmlDebuggingLibrary()) {
// This Qt version has the QML debugging services built in, however // This Qt version has the QML debugging services built in, however
// they still need to be enabled at compile time // they still need to be enabled at compile time
arguments << QLatin1String("CONFIG+=declarative_debug"); arguments << QLatin1String(Constants::QMAKEVAR_DECLARATIVE_DEBUG);
} else { } else {
QString qmlDebuggingHelperLibrary = bc->qtVersion()->qmlDebuggingHelperLibrary(true); QString qmlDebuggingHelperLibrary = bc->qtVersion()->qmlDebuggingHelperLibrary(true);
if (!qmlDebuggingHelperLibrary.isEmpty()) { if (!qmlDebuggingHelperLibrary.isEmpty()) {

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

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

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

@@ -115,6 +115,7 @@ const char * const ICON_HTML5_APP = ":/wizards/images/html5app.png";
// Env variables // Env variables
const char * const QMAKEVAR_QMLJSDEBUGGER_PATH = "QMLJSDEBUGGER_PATH"; const char * const QMAKEVAR_QMLJSDEBUGGER_PATH = "QMLJSDEBUGGER_PATH";
const char * const QMAKEVAR_DECLARATIVE_DEBUG = "CONFIG+=declarative_debug";
} // namespace Constants } // namespace Constants
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager