##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix compilation on platforms without QtQuick1...
Maurice Kalinowski -
r2702:ee35574f0d66
parent child
Show More
Side by Side Unified
Context file:
r2702:ee35574f0d66 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,31 +1,34
1 1 CURRENTLY_BUILDING_COMPONENTS = "demos"
2 2 !include( ../config.pri ) {
3 3 error( "Couldn't find the config.pri file!" )
4 4 }
5 5
6 6 TEMPLATE = subdirs
7 7 SUBDIRS += piechartcustomization \
8 8 dynamicspline \
9 9 nesteddonuts \
10 qmlchart \
10 chartinteractions \
11 callout \
12 chartthemes
13
14 !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) {
15 SUBDIRS += qmlchart \
11 16 qmlweather \
12 17 qmlf1legends \
13 18 qmlcustomizations \
14 chartinteractions \
15 19 qmlaxes \
16 20 qmlcustomlegend \
17 callout \
18 21 qmlpolarchart \
19 qmloscilloscope \
20 chartthemes
22 qmloscilloscope
23 }
21 24
22 25 contains(QT_CONFIG, multimedia) {
23 26 SUBDIRS += audio
24 27 } else {
25 28 message("QtMultimedia library not available. Some demos are disabled")
26 29 }
27 30
28 31 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
29 32 SUBDIRS += quick2chart \
30 33 quick2oscilloscope
31 34 }
Show file before | Show file after | Hide comments
@@ -1,42 +1,45
1 1 CURRENTLY_BUILDING_COMPONENTS = "examples"
2 2 !include( ../config.pri ) {
3 3 error( "Couldn't find the config.pri file!" )
4 4 }
5 5
6 6 TEMPLATE = subdirs
7 7 SUBDIRS += \
8 8 areachart \
9 9 customchart \
10 10 linechart \
11 11 percentbarchart \
12 12 piechart \
13 13 piechartdrilldown \
14 14 scatterchart \
15 15 scatterinteractions \
16 16 splinechart \
17 17 stackedbarchart \
18 18 stackedbarchartdrilldown \
19 19 zoomlinechart \
20 20 modeldata \
21 21 barchart \
22 22 boxplotchart \
23 23 legend \
24 24 barmodelmapper \
25 qmlboxplot \
26 qmlpiechart \
27 25 lineandbar \
28 26 horizontalbarchart \
29 27 horizontalstackedbarchart \
30 28 horizontalpercentbarchart \
31 29 donutbreakdown \
32 30 temperaturerecords \
33 31 donutchart \
34 32 multiaxis \
35 33 legendmarkers \
36 34 logvalueaxis \
37 35 polarchart
38 36
37 !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) {
38 SUBDIRS += qmlboxplot \
39 qmlpiechart
40 }
41
39 42 !linux-arm*: {
40 43 SUBDIRS += \
41 44 datetimeaxis
42 45 }
Show file before | Show file after | Hide comments
@@ -1,14 +1,16
1 1 !include( ../config.pri ) {
2 2 error( "Couldn't find the config.pri file!" )
3 3 }
4 4
5 5 TEMPLATE = subdirs
6 6
7 7 contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
8 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 9 } else {
10 SUBDIRS += quick1
11 10 contains(QT_VERSION, ^5\\..*\\..*$) {
12 11 qtHaveModule(quick): SUBDIRS += quick2
12 qtHaveModule(declarative): SUBDIRS += quick1
13 } else {
14 SUBDIRS += quick1
13 15 }
14 16 }
Show file before | Show file after | Hide comments
@@ -1,54 +1,54
1 1 !include( ../tests.pri ) {
2 2 error( "Couldn't find the tests.pri file!" )
3 3 }
4 4
5 5 TEMPLATE = subdirs
6 6 SUBDIRS += \
7 7 qchartview \
8 8 qchart \
9 9 qlineseries \
10 10 qbarset \
11 11 qbarseries \
12 12 qstackedbarseries \
13 13 qpercentbarseries \
14 14 qpieslice qpieseries \
15 15 qpiemodelmapper \
16 16 qsplineseries \
17 17 qscatterseries \
18 18 qxymodelmapper \
19 19 qbarmodelmapper \
20 20 qhorizontalbarseries \
21 21 qhorizontalstackedbarseries \
22 22 qhorizontalpercentbarseries \
23 23 qvalueaxis \
24 24 qlogvalueaxis \
25 25 qcategoryaxis \
26 26 qbarcategoryaxis \
27 27 domain \
28 28 chartdataset \
29 29 qlegend
30 30
31 31 contains(QT_VERSION, ^4\\.[0-7]\\.[0-3]\\s*$) | contains(QT_VERSION, ^4\\.[0-6]\\..*) {
32 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 33 } else {
34 SUBDIRS += qml
34 !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative): SUBDIRS += qml
35 35
36 36 # Check if QtQuickTest is installed
37 37 exists($$(QTDIR)/mkspecs/features/qmltestcase.prf){
38 38 SUBDIRS += qml-qtquicktest
39 39 } else {
40 40 warning("QtQuickTest not found; cannot build QML api unit tests")
41 41 }
42 42 }
43 43
44 44 !linux-arm*: {
45 45 SUBDIRS += \
46 46 qdatetimeaxis
47 47 }
48 48
49 49 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
50 50 SUBDIRS += quick2
51 51 }
52 52
53 53
54 54
Show file before | Show file after | Hide comments
@@ -1,24 +1,27
1 1 !include( ../config.pri ) {
2 2 error( "Couldn't find the config.pri file!" )
3 3 }
4 4
5 5 TEMPLATE = subdirs
6 6 SUBDIRS += \
7 7 auto \
8 qmlchartproperties \
9 qmlchartaxis \
10 8 presenterchart \
11 9 polarcharttest \
12 10 boxplottester
13 11
12 !contains(QT_VERSION, ^5\\..*\\..*$)|qtHaveModule(declarative) {
13 SUBDIRS += qmlchartproperties \
14 qmlchartaxis
15 }
16
14 17 contains(QT_CONFIG, opengl) {
15 18 SUBDIRS += chartwidgettest \
16 19 wavechart \
17 20 chartviewer
18 21 } else {
19 22 message("OpenGL not available. Some test apps are disabled")
20 23 }
21 24
22 25 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
23 26 SUBDIRS += quick2chartproperties
24 27 }
General Comments 0
You need to be logged in to leave comments. Login now