From 5407eb4cd85a24ddb3ba574718112d25cd4309a2 2013-05-22 12:11:38
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: 2013-05-22 12:11:38
Subject: [PATCH] Remove opengl dependency from oscilloscope demos.

These demos do not actually use opengl for anything, so no need
for the dependency. This dependency also breaks the demos in
android.

Change-Id: I4da2a83f11fddd416034821d233f0543ee0900ed
Reviewed-by: Mika Salmela <mika.salmela@digia.com>

---

diff --git a/demos/demos.pro b/demos/demos.pro
index c66eafc..3f8d099 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -16,14 +16,9 @@ SUBDIRS += piechartcustomization \
            qmlaxes \
            qmlcustomlegend \
            callout \
-           qmlpolarchart
-
-contains(QT_CONFIG, opengl) {
-        SUBDIRS +=  chartthemes \
-                    qmloscilloscope
-} else {
-    message("OpenGL not available. Some demos are disabled")
-}
+           qmlpolarchart \
+           qmloscilloscope \
+           chartthemes
 
 contains(QT_CONFIG, multimedia) {
         SUBDIRS += audio
diff --git a/demos/qmloscilloscope/datasource.cpp b/demos/qmloscilloscope/datasource.cpp
index 0cfbded..e2dcbb1 100644
--- a/demos/qmloscilloscope/datasource.cpp
+++ b/demos/qmloscilloscope/datasource.cpp
@@ -22,7 +22,6 @@
 #include <QXYSeries>
 #include <QAreaSeries>
 #include <QDeclarativeView>
-#include <QGLWidget>
 #include <QDebug>
 #include <cmath>
 
diff --git a/demos/qmloscilloscope/qmloscilloscope.pro b/demos/qmloscilloscope/qmloscilloscope.pro
index 47a4dcc..5bf080e 100644
--- a/demos/qmloscilloscope/qmloscilloscope.pro
+++ b/demos/qmloscilloscope/qmloscilloscope.pro
@@ -2,7 +2,6 @@
     error( "Couldn't find the demos.pri file!" )
 }
 
-QT += opengl
 RESOURCES += resources.qrc
 SOURCES += main.cpp \
     datasource.cpp
diff --git a/demos/quick2oscilloscope/datasource.cpp b/demos/quick2oscilloscope/datasource.cpp
index 751feb6..62daf82 100644
--- a/demos/quick2oscilloscope/datasource.cpp
+++ b/demos/quick2oscilloscope/datasource.cpp
@@ -23,7 +23,6 @@
 #include <QAreaSeries>
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
-#include <QGLWidget>
 #include <QDebug>
 #include <cmath>
 
diff --git a/demos/quick2oscilloscope/quick2oscilloscope.pro b/demos/quick2oscilloscope/quick2oscilloscope.pro
index 537ecee..3f5575a 100644
--- a/demos/quick2oscilloscope/quick2oscilloscope.pro
+++ b/demos/quick2oscilloscope/quick2oscilloscope.pro
@@ -2,7 +2,6 @@
     error( "Couldn't find the demos.pri file!" )
 }
 
-QT += opengl
 RESOURCES += resources.qrc
 SOURCES += main.cpp \
            datasource.cpp