From e6b42646fd477daf31caf52ead3f9452f340c114 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 31 Mar 2014 16:29:06 +0200 Subject: Make "Qt.declarative" available as "Qt.quick" again for Qt 4. This was accidentally removed when switching to the new Qt modules approach. Change-Id: Ie8db5a183c2cc3a82d31c2793710983cf4206ef0 Reviewed-by: Joerg Bornemann --- src/lib/qtprofilesetup/qtprofilesetup.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index c9000947a..da892a739 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -209,6 +209,9 @@ static void createModules(Profile &profile, Settings *settings, virtualModule.qbsName = QLatin1String("widgets"); virtualModule.dependencies = QStringList() << QLatin1String("core") << QLatin1String("gui"); modules << virtualModule; + virtualModule.qbsName = QLatin1String("quick"); + virtualModule.dependencies = QStringList() << QLatin1String("declarative"); + modules << virtualModule; virtualModule.qbsName = QLatin1String("concurrent"); virtualModule.dependencies = QStringList() << QLatin1String("core"); modules << virtualModule; @@ -306,9 +309,12 @@ static void createModules(Profile &profile, Settings *settings, QByteArray propertiesString; if (module.qbsName == QLatin1String("declarative") || module.qbsName == QLatin1String("quick")) { + const QByteArray debugMacro = module.qbsName == QLatin1String("declarative") + || qtEnvironment.qtMajorVersion < 5 + ? "QT_DECLARATIVE_DEBUG" : "QT_QML_DEBUG"; propertiesString = "property bool qmlDebugging: false\n" " cpp.defines: " - "qmlDebugging ? base.concat('QT_QML_DEBUG') : base"; + "qmlDebugging ? base.concat('" + debugMacro + "') : base"; } content.replace("### special properties", propertiesString); moduleFile.resize(0); -- cgit v1.2.3