From 14ee91dc5425fc95b7a970c7843b5160ecb69642 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Thu, 1 Sep 2011 09:43:08 +0200
Subject: [PATCH] Remove CONFIG+=declarative_debug from imported build line
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>
---
src/plugins/qt4projectmanager/qmakestep.cpp | 2 +-
src/plugins/qt4projectmanager/qt4buildconfiguration.cpp | 7 +++++--
src/plugins/qt4projectmanager/qt4projectmanagerconstants.h | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/plugins/qt4projectmanager/qmakestep.cpp b/src/plugins/qt4projectmanager/qmakestep.cpp
index cc3b795d972..b4ea3b8b83b 100644
--- a/src/plugins/qt4projectmanager/qmakestep.cpp
+++ b/src/plugins/qt4projectmanager/qmakestep.cpp
@@ -178,7 +178,7 @@ QStringList QMakeStep::moreArguments()
if (!bc->qtVersion()->needsQmlDebuggingLibrary()) {
// This Qt version has the QML debugging services built in, however
// they still need to be enabled at compile time
- arguments << QLatin1String("CONFIG+=declarative_debug");
+ arguments << QLatin1String(Constants::QMAKEVAR_DECLARATIVE_DEBUG);
} else {
QString qmlDebuggingHelperLibrary = bc->qtVersion()->qmlDebuggingHelperLibrary(true);
if (!qmlDebuggingHelperLibrary.isEmpty()) {
diff --git a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
index 47512b7cbd1..44a840e6f8f 100644
--- a/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
+++ b/src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
@@ -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,
diff --git a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
index f3a21193b12..35c8ca0ceda 100644
--- a/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
+++ b/src/plugins/qt4projectmanager/qt4projectmanagerconstants.h
@@ -115,6 +115,7 @@ const char * const ICON_HTML5_APP = ":/wizards/images/html5app.png";
// Env variables
const char * const QMAKEVAR_QMLJSDEBUGGER_PATH = "QMLJSDEBUGGER_PATH";
+const char * const QMAKEVAR_DECLARATIVE_DEBUG = "CONFIG+=declarative_debug";
} // namespace Constants
} // namespace Qt4ProjectManager
--
GitLab