summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@digia.com>2014-06-13 13:07:42 +0200
committerMaurice Kalinowski <maurice.kalinowski@digia.com>2014-06-16 10:43:31 +0300
commitee35574f0d6694ab300a6cf6a6b2f22eaddc8c4e (patch)
tree3d9efd3cff0e1d7af76beb64422c1cb32b1153b1 /plugins
parent23f5eaaadbea9c88eb88e3b6fc0bd854a7e37d21 (diff)
Fix compilation on platforms without QtQuick1
WinRT is one of those, but you might want to configure Qt in that way also on other platforms. Change-Id: I40e5d0b8bc0c347f058d5f30d64ddbf55653f904 Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com> Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Diffstat (limited to 'plugins')
-rw-r--r--plugins/plugins.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/plugins/plugins.pro b/plugins/plugins.pro
index 7d2c352f..6d70b7ec 100644
--- a/plugins/plugins.pro
+++ b/plugins/plugins.pro
@@ -7,8 +7,10 @@ TEMPLATE = subdirs
contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.")
} else {
- SUBDIRS += quick1
contains(QT_VERSION, ^5\\..*\\..*$) {
qtHaveModule(quick): SUBDIRS += quick2
+ qtHaveModule(declarative): SUBDIRS += quick1
+ } else {
+ SUBDIRS += quick1
}
}