aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-03-31 11:23:45 +0200
committerJoerg Bornemann <joerg.bornemann@digia.com>2014-03-31 11:59:50 +0200
commitd74004353467f47a2bc4417bdfd277a1cd26c780 (patch)
treecf9d0a01720e7e94bc90dec5c2562da072caace4 /src
parenta27c3eec3345dff11ba1f67ff7b060eaef7a8090 (diff)
Fix QML debugging for Qt 5.
The line enabling the respective C++ macro got lost when we switched to the new Qt module approach. (And the name of the macro was wrong for Qt 5 anyway, so it hadn't worked before either.) Also add an autotest to catch things like macro renaming in the future. Task-number: QTCREATORBUG-11914 Change-Id: Ica188c20e99c204d1a9d4e5f285a938707d997dd Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index eb83e67a6..c9000947a 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -306,7 +306,9 @@ static void createModules(Profile &profile, Settings *settings,
QByteArray propertiesString;
if (module.qbsName == QLatin1String("declarative")
|| module.qbsName == QLatin1String("quick")) {
- propertiesString = "property bool qmlDebugging: false";
+ propertiesString = "property bool qmlDebugging: false\n"
+ " cpp.defines: "
+ "qmlDebugging ? base.concat('QT_QML_DEBUG') : base";
}
content.replace("### special properties", propertiesString);
moduleFile.resize(0);