##// 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 CURRENTLY_BUILDING_COMPONENTS = "demos"
1 CURRENTLY_BUILDING_COMPONENTS = "demos"
2 !include( ../config.pri ) {
2 !include( ../config.pri ) {
3 error( "Couldn't find the config.pri file!" )
3 error( "Couldn't find the config.pri file!" )
4 }
4 }
5
5
6 TEMPLATE = subdirs
6 TEMPLATE = subdirs
7 SUBDIRS += piechartcustomization \
7 SUBDIRS += piechartcustomization \
8 dynamicspline \
8 dynamicspline \
9 nesteddonuts \
9 nesteddonuts \
10 qmlchart \
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
24 } else {
27 } else {
25 message("QtMultimedia library not available. Some demos are disabled")
28 message("QtMultimedia library not available. Some demos are disabled")
26 }
29 }
27
30
28 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
31 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
29 SUBDIRS += quick2chart \
32 SUBDIRS += quick2chart \
30 quick2oscilloscope
33 quick2oscilloscope
31 }
34 }
Show file before | Show file after | Hide comments
@@ -1,42 +1,45
1 CURRENTLY_BUILDING_COMPONENTS = "examples"
1 CURRENTLY_BUILDING_COMPONENTS = "examples"
2 !include( ../config.pri ) {
2 !include( ../config.pri ) {
3 error( "Couldn't find the config.pri file!" )
3 error( "Couldn't find the config.pri file!" )
4 }
4 }
5
5
6 TEMPLATE = subdirs
6 TEMPLATE = subdirs
7 SUBDIRS += \
7 SUBDIRS += \
8 areachart \
8 areachart \
9 customchart \
9 customchart \
10 linechart \
10 linechart \
11 percentbarchart \
11 percentbarchart \
12 piechart \
12 piechart \
13 piechartdrilldown \
13 piechartdrilldown \
14 scatterchart \
14 scatterchart \
15 scatterinteractions \
15 scatterinteractions \
16 splinechart \
16 splinechart \
17 stackedbarchart \
17 stackedbarchart \
18 stackedbarchartdrilldown \
18 stackedbarchartdrilldown \
19 zoomlinechart \
19 zoomlinechart \
20 modeldata \
20 modeldata \
21 barchart \
21 barchart \
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 \
30 horizontalpercentbarchart \
28 horizontalpercentbarchart \
31 donutbreakdown \
29 donutbreakdown \
32 temperaturerecords \
30 temperaturerecords \
33 donutchart \
31 donutchart \
34 multiaxis \
32 multiaxis \
35 legendmarkers \
33 legendmarkers \
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
42 }
45 }
Show file before | Show file after | Hide comments
@@ -1,14 +1,16
1 !include( ../config.pri ) {
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
2 error( "Couldn't find the config.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6
6
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 }
Show file before | Show file after | Hide comments
@@ -1,54 +1,54
1 !include( ../tests.pri ) {
1 !include( ../tests.pri ) {
2 error( "Couldn't find the tests.pri file!" )
2 error( "Couldn't find the tests.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS += \
6 SUBDIRS += \
7 qchartview \
7 qchartview \
8 qchart \
8 qchart \
9 qlineseries \
9 qlineseries \
10 qbarset \
10 qbarset \
11 qbarseries \
11 qbarseries \
12 qstackedbarseries \
12 qstackedbarseries \
13 qpercentbarseries \
13 qpercentbarseries \
14 qpieslice qpieseries \
14 qpieslice qpieseries \
15 qpiemodelmapper \
15 qpiemodelmapper \
16 qsplineseries \
16 qsplineseries \
17 qscatterseries \
17 qscatterseries \
18 qxymodelmapper \
18 qxymodelmapper \
19 qbarmodelmapper \
19 qbarmodelmapper \
20 qhorizontalbarseries \
20 qhorizontalbarseries \
21 qhorizontalstackedbarseries \
21 qhorizontalstackedbarseries \
22 qhorizontalpercentbarseries \
22 qhorizontalpercentbarseries \
23 qvalueaxis \
23 qvalueaxis \
24 qlogvalueaxis \
24 qlogvalueaxis \
25 qcategoryaxis \
25 qcategoryaxis \
26 qbarcategoryaxis \
26 qbarcategoryaxis \
27 domain \
27 domain \
28 chartdataset \
28 chartdataset \
29 qlegend
29 qlegend
30
30
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){
38 SUBDIRS += qml-qtquicktest
38 SUBDIRS += qml-qtquicktest
39 } else {
39 } else {
40 warning("QtQuickTest not found; cannot build QML api unit tests")
40 warning("QtQuickTest not found; cannot build QML api unit tests")
41 }
41 }
42 }
42 }
43
43
44 !linux-arm*: {
44 !linux-arm*: {
45 SUBDIRS += \
45 SUBDIRS += \
46 qdatetimeaxis
46 qdatetimeaxis
47 }
47 }
48
48
49 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
49 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
50 SUBDIRS += quick2
50 SUBDIRS += quick2
51 }
51 }
52
52
53
53
54
54
Show file before | Show file after | Hide comments
@@ -1,24 +1,27
1 !include( ../config.pri ) {
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
2 error( "Couldn't find the config.pri file!" )
3 }
3 }
4
4
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 \
17 chartviewer
20 chartviewer
18 } else {
21 } else {
19 message("OpenGL not available. Some test apps are disabled")
22 message("OpenGL not available. Some test apps are disabled")
20 }
23 }
21
24
22 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
25 contains(QT_VERSION, ^5\\..*\\..*$):qtHaveModule(quick) {
23 SUBDIRS += quick2chartproperties
26 SUBDIRS += quick2chartproperties
24 }
27 }
General Comments 0
You need to be logged in to leave comments. Login now