aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@nokia.com>2011-08-02 12:53:51 +0200
committerKai Koehne <kai.koehne@nokia.com>2011-08-02 15:40:35 +0200
commitad3b92b1f4abb8cd0e28cf7951007ab707d612fc (patch)
tree09b1b9dba054c69542f36043da5990af46d4829b
parent6d90cabe7ff40fac451864448bbaebd60adae969 (diff)
QtQuickApp template: Don't enable qml debugging for every debug build
This can be confusing, since there is also the switch in the qmake step, which is on by default for debug builds too. However, if one disables it you expect that debugging has in fact been disabled. Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2 Reviewed-on: http://codereview.qt.nokia.com/2511 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
-rw-r--r--share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri1
-rw-r--r--src/plugins/qt4projectmanager/wizards/qtquickapp.cpp2
2 files changed, 1 insertions, 2 deletions
diff --git a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
index 29006f5a79..6704a74c1b 100644
--- a/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
+++ b/share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.pri
@@ -5,7 +5,6 @@
# may offer an updated version of it.
QT += declarative
-CONFIG(debug, debug|release):CONFIG += declarative_debug
SOURCES += $$PWD/qmlapplicationviewer.cpp
HEADERS += $$PWD/qmlapplicationviewer.h
diff --git a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
index b6448213c4..7dabc385ea 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickapp.cpp
@@ -460,7 +460,7 @@ QString QtQuickApp::componentSetDir(ComponentSet componentSet) const
}
}
-const int QtQuickApp::StubVersion = 13;
+const int QtQuickApp::StubVersion = 14;
} // namespace Internal
} // namespace Qt4ProjectManager