From d0baf43b6aa3ef2afb87ee8ec4567d2625731a60 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Wed, 3 Nov 2010 13:47:42 +0100
Subject: [PATCH] Qml Wizard: Turn error about qml debugging getting disabled
into a warning
Qml Debugging requires 4.7.1, and the path of qmljsdebugger being
specified on the command line. Just disable debugging if this
isn't the case instead of bailing out an error.
Reviewed-by: dt
---
.../qmlapplicationviewer/qmlapplicationviewer.pri | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
index 09fd0efa799..246f25e7845 100644
--- a/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qmlapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -33,21 +33,21 @@ defineTest(minQtVersion) {
contains(DEFINES, QMLJSDEBUGGER) {
CONFIG(debug, debug|release) {
!minQtVersion(4, 7, 1) {
+ warning()
+ warning("Disabling QML debugging:")
warning()
warning("Debugging QML requires the qmljsdebugger library that ships with Qt Creator.")
warning("This library requires Qt 4.7.1 or newer.")
warning()
-
- error("Qt version $$QT_VERSION too old for QmlJS Debugging. Aborting.")
- }
- isEmpty(QMLJSDEBUGGER_PATH) {
+ DEFINES -= QMLJSDEBUGGER
+ } else:isEmpty(QMLJSDEBUGGER_PATH) {
+ warning()
+ warning("Disabling QML debugging:")
warning()
warning("Debugging QML requires the qmljsdebugger library that ships with Qt Creator.")
warning("Please specify its location on the qmake command line, eg")
warning(" qmake -r QMLJSDEBUGGER_PATH=$CREATORDIR/share/qtcreator/qmljsdebugger")
warning()
-
- error("QMLJSDEBUGGER defined, but no QMLJSDEBUGGER_PATH set on command line. Aborting.")
DEFINES -= QMLJSDEBUGGER
} else {
include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
--
GitLab