From 304b3c881c6e253b18fac0c98c478c430f84a7be Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Mon, 7 Mar 2011 12:21:39 +0100
Subject: [PATCH] QtQuickApp: Remove QMLJSDEBUGGER define from custom .pro file
The qmljsdebugger-lib.pri is only included in 2.2 if the user explicitly
selected it in the Project Settings.
Reviewed-by: Christiaan Janssen
---
share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri | 2 ++
share/qtcreator/templates/qtquickapp/app.pro | 4 ----
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
index 35a38855d64..98f98ab713c 100644
--- a/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
+++ b/share/qtcreator/qml/qmljsdebugger/qmljsdebugger-lib.pri
@@ -9,3 +9,5 @@ CONFIG(debug, debug|release) {
windows:DEBUGLIB = QmlJSDebuggerd
}
LIBS += -L$$PWD -l$$DEBUGLIB
+
+DEFINES += QMLJSDEBUGGER
diff --git a/share/qtcreator/templates/qtquickapp/app.pro b/share/qtcreator/templates/qtquickapp/app.pro
index bf48f9be7ad..d51c291ade8 100644
--- a/share/qtcreator/templates/qtquickapp/app.pro
+++ b/share/qtcreator/templates/qtquickapp/app.pro
@@ -23,10 +23,6 @@ symbian:TARGET.UID3 = 0xE1111234
# NETWORKACCESS #
symbian:TARGET.CAPABILITY += NetworkServices
-# Define QMLJSDEBUGGER to allow debugging of QML in debug builds
-# (This might significantly increase build time)
-# DEFINES += QMLJSDEBUGGER
-
# If your application uses the Qt Mobility libraries, uncomment the following
# lines and add the respective components to the MOBILITY variable.
# CONFIG += mobility
--
GitLab