##// END OF EJS Templates
Remove opengl dependency from oscilloscope demos....
Miikka Heikkinen -
r2525:5407eb4cd85a
parent child
Show More
@@ -16,14 +16,9 SUBDIRS += piechartcustomization \
16 qmlaxes \
16 qmlaxes \
17 qmlcustomlegend \
17 qmlcustomlegend \
18 callout \
18 callout \
19 qmlpolarchart
19 qmlpolarchart \
20
20 qmloscilloscope \
21 contains(QT_CONFIG, opengl) {
21 chartthemes
22 SUBDIRS += chartthemes \
23 qmloscilloscope
24 } else {
25 message("OpenGL not available. Some demos are disabled")
26 }
27
22
28 contains(QT_CONFIG, multimedia) {
23 contains(QT_CONFIG, multimedia) {
29 SUBDIRS += audio
24 SUBDIRS += audio
@@ -22,7 +22,6
22 #include <QXYSeries>
22 #include <QXYSeries>
23 #include <QAreaSeries>
23 #include <QAreaSeries>
24 #include <QDeclarativeView>
24 #include <QDeclarativeView>
25 #include <QGLWidget>
26 #include <QDebug>
25 #include <QDebug>
27 #include <cmath>
26 #include <cmath>
28
27
@@ -2,7 +2,6
2 error( "Couldn't find the demos.pri file!" )
2 error( "Couldn't find the demos.pri file!" )
3 }
3 }
4
4
5 QT += opengl
6 RESOURCES += resources.qrc
5 RESOURCES += resources.qrc
7 SOURCES += main.cpp \
6 SOURCES += main.cpp \
8 datasource.cpp
7 datasource.cpp
@@ -23,7 +23,6
23 #include <QAreaSeries>
23 #include <QAreaSeries>
24 #include <QtQuick/QQuickView>
24 #include <QtQuick/QQuickView>
25 #include <QtQuick/QQuickItem>
25 #include <QtQuick/QQuickItem>
26 #include <QGLWidget>
27 #include <QDebug>
26 #include <QDebug>
28 #include <cmath>
27 #include <cmath>
29
28
@@ -2,7 +2,6
2 error( "Couldn't find the demos.pri file!" )
2 error( "Couldn't find the demos.pri file!" )
3 }
3 }
4
4
5 QT += opengl
6 RESOURCES += resources.qrc
5 RESOURCES += resources.qrc
7 SOURCES += main.cpp \
6 SOURCES += main.cpp \
8 datasource.cpp
7 datasource.cpp
General Comments 0
You need to be logged in to leave comments. Login now