##// END OF EJS Templates
Added check for openGL support
Marek Rosa -
r1951:8ceebe0572c4
parent child
Show More
@@ -1,18 +1,23
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 += chartthemes \
7 SUBDIRS += piechartcustomization \
8 piechartcustomization \
9 dynamicspline \
8 dynamicspline \
10 nesteddonuts \
9 nesteddonuts \
11 qmlchart \
10 qmlchart \
12 qmlweather \
11 qmlweather \
13 qmlf1legends \
12 qmlf1legends \
14 qmlcustomizations \
13 qmlcustomizations \
15 qmlcustommodel \
14 qmlcustommodel \
16 qmloscilloscope \
17 chartviewer \
18 chartinteractions
15 chartinteractions
16
17 contains(QT_CONFIG, opengl) {
18 SUBDIRS += chartthemes \
19 qmloscilloscope \
20 chartviewer
21 } else {
22 message("OpenGL not available. Some demos are disabled")
23 }
@@ -1,15 +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 SUBDIRS += \
6 SUBDIRS += \
7 auto \
7 auto \
8 chartwidgettest \
9 qmlchartproperties \
8 qmlchartproperties \
10 qmlchartaxis
9 qmlchartaxis
11
10
12 !linux-arm*: {
11 contains(QT_CONFIG, opengl) {
13 SUBDIRS += \
12 SUBDIRS += chartwidgettest \
14 wavechart
13 wavechart
14 } else {
15 message("OpenGL not available. Some test apps are disabled")
15 }
16 }
General Comments 0
You need to be logged in to leave comments. Login now