From 8ceebe0572c49bd94e5fe68cee6068a4d91012cf 2012-09-04 06:50:36
From: Marek Rosa <marek.rosa@digia.com>
Date: 2012-09-04 06:50:36
Subject: [PATCH] Added check for openGL support

---

diff --git a/demos/demos.pro b/demos/demos.pro
index 4d38436..9cea903 100644
--- a/demos/demos.pro
+++ b/demos/demos.pro
@@ -4,8 +4,7 @@ CURRENTLY_BUILDING_COMPONENTS = "demos"
 }
 
 TEMPLATE = subdirs
-SUBDIRS += chartthemes \
-           piechartcustomization \
+SUBDIRS += piechartcustomization \
            dynamicspline \
            nesteddonuts \
            qmlchart \
@@ -13,6 +12,12 @@ SUBDIRS += chartthemes \
            qmlf1legends \
            qmlcustomizations \
            qmlcustommodel \
-           qmloscilloscope \
-           chartviewer \
            chartinteractions
+
+contains(QT_CONFIG, opengl) {
+        SUBDIRS +=  chartthemes \
+                    qmloscilloscope \
+                    chartviewer
+} else {
+    message("OpenGL not available. Some demos are disabled")
+}
diff --git a/tests/tests.pro b/tests/tests.pro
index 5ad9635..a02f302 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -4,12 +4,13 @@
 
 TEMPLATE = subdirs
 SUBDIRS += \ 
-    auto \
-    chartwidgettest \
+    auto \    
     qmlchartproperties \
     qmlchartaxis
 
-!linux-arm*: {
-    SUBDIRS += \
-            wavechart
+contains(QT_CONFIG, opengl) {
+    SUBDIRS +=  chartwidgettest \
+                wavechart
+} else {
+    message("OpenGL not available. Some test apps are disabled")
 }