diff options
| author | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-06-13 13:07:42 +0200 |
|---|---|---|
| committer | Maurice Kalinowski <maurice.kalinowski@digia.com> | 2014-06-16 10:43:31 +0300 |
| commit | ee35574f0d6694ab300a6cf6a6b2f22eaddc8c4e (patch) | |
| tree | 3d9efd3cff0e1d7af76beb64422c1cb32b1153b1 | |
| parent | 23f5eaaadbea9c88eb88e3b6fc0bd854a7e37d21 (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>
| -rw-r--r-- | demos/demos.pro | 13 | ||||
| -rw-r--r-- | examples/examples.pro | 7 | ||||
| -rw-r--r-- | plugins/plugins.pro | 4 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/tests.pro | 7 |
5 files changed, 22 insertions, 11 deletions
diff --git a/demos/demos.pro b/demos/demos.pro index e43ff973..98937905 100644 --- a/demos/demos.pro +++ b/demos/demos.pro @@ -7,17 +7,20 @@ TEMPLATE = subdirs SUBDIRS += piechartcustomization \ dynamicspline \ nesteddonuts \ - qmlchart \ + chartinteractions \ + callout \ + chartthemes + +!contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) { + SUBDIRS += qmlchart \ qmlweather \ qmlf1legends \ qmlcustomizations \ - chartinteractions \ qmlaxes \ qmlcustomlegend \ - callout \ qmlpolarchart \ - qmloscilloscope \ - chartthemes + qmloscilloscope +} contains(QT_CONFIG, multimedia) { SUBDIRS += audio diff --git a/examples/examples.pro b/examples/examples.pro index f6a63bb5..9985e63b 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -22,8 +22,6 @@ SUBDIRS += \ boxplotchart \ legend \ barmodelmapper \ - qmlboxplot \ - qmlpiechart \ lineandbar \ horizontalbarchart \ horizontalstackedbarchart \ @@ -36,6 +34,11 @@ SUBDIRS += \ logvalueaxis \ polarchart +!contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) { + SUBDIRS += qmlboxplot \ + qmlpiechart +} + !linux-arm*: { SUBDIRS += \ datetimeaxis 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 } } diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 8ab3a5f9..416b2372 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -31,7 +31,7 @@ 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 += qml + !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative): SUBDIRS += qml # Check if QtQuickTest is installed exists($$(QTDIR)/mkspecs/features/qmltestcase.prf){ diff --git a/tests/tests.pro b/tests/tests.pro index a0a9c1b6..79686122 100644 --- a/tests/tests.pro +++ b/tests/tests.pro @@ -5,12 +5,15 @@ TEMPLATE = subdirs SUBDIRS += \ auto \ - qmlchartproperties \ - qmlchartaxis \ presenterchart \ polarcharttest \ boxplottester +!contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) { + SUBDIRS += qmlchartproperties \ + qmlchartaxis +} + contains(QT_CONFIG, opengl) { SUBDIRS += chartwidgettest \ wavechart \ |