@@ -7,17 +7,20 TEMPLATE = subdirs | |||||
7 | SUBDIRS += piechartcustomization \ |
|
7 | SUBDIRS += piechartcustomization \ | |
8 | dynamicspline \ |
|
8 | dynamicspline \ | |
9 | nesteddonuts \ |
|
9 | nesteddonuts \ | |
10 |
|
|
10 | chartinteractions \ | |
|
11 | callout \ | |||
|
12 | chartthemes | |||
|
13 | ||||
|
14 | !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) { | |||
|
15 | SUBDIRS += qmlchart \ | |||
11 | qmlweather \ |
|
16 | qmlweather \ | |
12 | qmlf1legends \ |
|
17 | qmlf1legends \ | |
13 | qmlcustomizations \ |
|
18 | qmlcustomizations \ | |
14 | chartinteractions \ |
|
|||
15 | qmlaxes \ |
|
19 | qmlaxes \ | |
16 | qmlcustomlegend \ |
|
20 | qmlcustomlegend \ | |
17 | callout \ |
|
|||
18 | qmlpolarchart \ |
|
21 | qmlpolarchart \ | |
19 |
qmloscilloscope |
|
22 | qmloscilloscope | |
20 | chartthemes |
|
23 | } | |
21 |
|
24 | |||
22 | contains(QT_CONFIG, multimedia) { |
|
25 | contains(QT_CONFIG, multimedia) { | |
23 | SUBDIRS += audio |
|
26 | SUBDIRS += audio |
@@ -22,8 +22,6 SUBDIRS += \ | |||||
22 | boxplotchart \ |
|
22 | boxplotchart \ | |
23 | legend \ |
|
23 | legend \ | |
24 | barmodelmapper \ |
|
24 | barmodelmapper \ | |
25 | qmlboxplot \ |
|
|||
26 | qmlpiechart \ |
|
|||
27 | lineandbar \ |
|
25 | lineandbar \ | |
28 | horizontalbarchart \ |
|
26 | horizontalbarchart \ | |
29 | horizontalstackedbarchart \ |
|
27 | horizontalstackedbarchart \ | |
@@ -36,6 +34,11 SUBDIRS += \ | |||||
36 | logvalueaxis \ |
|
34 | logvalueaxis \ | |
37 | polarchart |
|
35 | polarchart | |
38 |
|
36 | |||
|
37 | !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) { | |||
|
38 | SUBDIRS += qmlboxplot \ | |||
|
39 | qmlpiechart | |||
|
40 | } | |||
|
41 | ||||
39 | !linux-arm*: { |
|
42 | !linux-arm*: { | |
40 | SUBDIRS += \ |
|
43 | SUBDIRS += \ | |
41 | datetimeaxis |
|
44 | datetimeaxis |
@@ -7,8 +7,10 TEMPLATE = subdirs | |||||
7 | contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) { |
|
7 | contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) { | |
8 | warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.") |
|
8 | warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.") | |
9 | } else { |
|
9 | } else { | |
10 | SUBDIRS += quick1 |
|
|||
11 | contains(QT_VERSION, ^5\\..*\\..*$) { |
|
10 | contains(QT_VERSION, ^5\\..*\\..*$) { | |
12 | qtHaveModule(quick): SUBDIRS += quick2 |
|
11 | qtHaveModule(quick): SUBDIRS += quick2 | |
|
12 | qtHaveModule(declarative): SUBDIRS += quick1 | |||
|
13 | } else { | |||
|
14 | SUBDIRS += quick1 | |||
13 | } |
|
15 | } | |
14 | } |
|
16 | } |
@@ -31,7 +31,7 SUBDIRS += \ | |||||
31 | contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) { |
|
31 | contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) { | |
32 | warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.") |
|
32 | warning("QtCommercial.Charts QML API requires at least Qt 4.7.4. You are using $${QT_VERSION} so the QML API is disabled.") | |
33 | } else { |
|
33 | } else { | |
34 | SUBDIRS += qml |
|
34 | !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative): SUBDIRS += qml | |
35 |
|
35 | |||
36 | # Check if QtQuickTest is installed |
|
36 | # Check if QtQuickTest is installed | |
37 | exists($$(QTDIR)/mkspecs/features/qmltestcase.prf){ |
|
37 | exists($$(QTDIR)/mkspecs/features/qmltestcase.prf){ |
@@ -5,12 +5,15 | |||||
5 | TEMPLATE = subdirs |
|
5 | TEMPLATE = subdirs | |
6 | SUBDIRS += \ |
|
6 | SUBDIRS += \ | |
7 | auto \ |
|
7 | auto \ | |
8 | qmlchartproperties \ |
|
|||
9 | qmlchartaxis \ |
|
|||
10 | presenterchart \ |
|
8 | presenterchart \ | |
11 | polarcharttest \ |
|
9 | polarcharttest \ | |
12 | boxplottester |
|
10 | boxplottester | |
13 |
|
11 | |||
|
12 | !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) { | |||
|
13 | SUBDIRS += qmlchartproperties \ | |||
|
14 | qmlchartaxis | |||
|
15 | } | |||
|
16 | ||||
14 | contains(QT_CONFIG, opengl) { |
|
17 | contains(QT_CONFIG, opengl) { | |
15 | SUBDIRS += chartwidgettest \ |
|
18 | SUBDIRS += chartwidgettest \ | |
16 | wavechart \ |
|
19 | wavechart \ |
General Comments 0
You need to be logged in to leave comments.
Login now