diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-31 16:29:06 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-03-31 18:08:48 +0200 |
| commit | e6b42646fd477daf31caf52ead3f9452f340c114 (patch) | |
| tree | e61714fcbc9b1a08893fc904628f47103ea1bb27 /src | |
| parent | c6b93561618776bc247483e55db98df590ec0c8d (diff) | |
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 <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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); |