summaryrefslogtreecommitdiffstats
path: root/src/plugins/graphicssystems
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-11-02 05:17:12 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-11-02 05:19:47 (GMT)
commitd26bc43093cc6ed8d387abedcde0952ec24c0e0b (patch)
tree04c4306df212c7079914d9cf7545a73edf9d9ad0 /src/plugins/graphicssystems
parent504ac5668c7308dc67233ed8589eeadcd23e7cdd (diff)
downloadQt-d26bc43093cc6ed8d387abedcde0952ec24c0e0b.zip
Qt-d26bc43093cc6ed8d387abedcde0952ec24c0e0b.tar.gz
Qt-d26bc43093cc6ed8d387abedcde0952ec24c0e0b.tar.bz2
Compilation failure for OpenGL and OpenVG graphic system plugins when
Opengl ES is used on Qt for Windows CE For WindowsCE plugins do not support version 1.x of OpenGL ES Task-number : QTBUG-5080 Reviewed-by : Trond Kjernåsen
Diffstat (limited to 'src/plugins/graphicssystems')
-rw-r--r--src/plugins/graphicssystems/graphicssystems.pro10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/plugins/graphicssystems/graphicssystems.pro b/src/plugins/graphicssystems/graphicssystems.pro
index 14e3cfc..ca87b98 100644
--- a/src/plugins/graphicssystems/graphicssystems.pro
+++ b/src/plugins/graphicssystems/graphicssystems.pro
@@ -1,7 +1,13 @@
TEMPLATE = subdirs
SUBDIRS += trace
-contains(QT_CONFIG, opengl):SUBDIRS += opengl
-contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg
+!wince*{
+ contains(QT_CONFIG, opengl):SUBDIRS += opengl
+ contains(QT_CONFIG, openvg):contains(QT_CONFIG, egl):SUBDIRS += openvg
+}else {
+ # For WindowsCE only 2.x of OpenGL ES is supported by these plugins at this time
+ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):SUBDIRS += opengl
+ contains(QT_CONFIG, openvg):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, opengles1cl):contains(QT_CONFIG, egl):SUBDIRS += openvg
+}
contains(QT_CONFIG, shivavg) {
# Only works under X11 at present