diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-04-18 13:30:07 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2013-04-23 09:24:32 +0300 |
| commit | 5862599d088d072b4ac89ed556a645680f786d80 (patch) | |
| tree | 838db883bea99b520ae90c634746f9f942fb6832 /plugins/plugins.pro | |
| parent | b0caebd0eeccca1b5e901faa6e5df1a1f6301312 (diff) | |
Generate charts plugin for QtQuick2 as well as QtQuick1
Added quick2 versions of a couple of demos, too.
Task-number: QTRD-1922
Change-Id: Ie3e2c1c40c38e06fc6d3afe27289eccc2f997f67
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Diffstat (limited to 'plugins/plugins.pro')
| -rw-r--r-- | plugins/plugins.pro | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/plugins/plugins.pro b/plugins/plugins.pro index e9cda3b0..704489d1 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -7,7 +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 += declarative + SUBDIRS += quick1 + contains(QT_VERSION, ^5\\..*\\..*$) { + qtHaveModule(quick): SUBDIRS += quick2 + } } !linux-arm*:!qnx:!vxworks:!wince*: { |