From 5b6815ba1d6d82687b8244172482bb089210c8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Wed, 4 Nov 2009 13:11:15 +0100
Subject: Fixed hardcoded GL library names on WinCE.

Task-number: QTBUG-5148
Reviewed-by: Tom Cooksey
---
 examples/opengl/hellogl_es/hellogl_es.pro   |  9 ---------
 examples/opengl/hellogl_es2/hellogl_es2.pro |  6 ------
 mkspecs/features/win32/opengl.prf           | 12 ++++++++++--
 src/opengl/opengl.pro                       | 17 +----------------
 4 files changed, 11 insertions(+), 33 deletions(-)

diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro
index 3168743..80ef7df 100644
--- a/examples/opengl/hellogl_es/hellogl_es.pro
+++ b/examples/opengl/hellogl_es/hellogl_es.pro
@@ -20,15 +20,6 @@ HEADERS += bubble.h
 RESOURCES += texture.qrc
 QT += opengl
 
-wince*:{
-    contains(QT_CONFIG,opengles1) {
-            QMAKE_LIBS += "libGLES_CM.lib"
-    }
-    contains(QT_CONFIG,opengles1cl) {
-            QMAKE_LIBS += "libGLES_CL.lib"
-    }
-}
-
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro
diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro
index d5ad4b8..92b4224 100644
--- a/examples/opengl/hellogl_es2/hellogl_es2.pro
+++ b/examples/opengl/hellogl_es2/hellogl_es2.pro
@@ -25,9 +25,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2
 INSTALLS += target sources
-
-
-wince*: {
-   QMAKE_LIBS += "libGLESv2.lib"
-
-}
\ No newline at end of file
diff --git a/mkspecs/features/win32/opengl.prf b/mkspecs/features/win32/opengl.prf
index 30af2a3..3414781 100644
--- a/mkspecs/features/win32/opengl.prf
+++ b/mkspecs/features/win32/opengl.prf
@@ -1,3 +1,11 @@
-QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
-QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
+# WinCE does not have a platform directory for .prf files, and the
+# win32 directory is searched for .prfs by qmake on WinCE. Ideally
+# there should be a features/wince/opengl.prf which contains the wince
+# block below.
 
+wince* {
+    include(../unix/opengl.prf)
+} else {
+    QMAKE_LIBS += $$QMAKE_LIBS_OPENGL
+    QMAKE_LFLAGS += $$QMAKE_LFLAGS_OPENGL
+}
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index deaf3bd..b2474ed 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -54,7 +54,7 @@ SOURCES	+= qgl.cpp \
                 gl2paintengineex/qpaintengineex_opengl2_p.h \
                 gl2paintengineex/qglengineshadersource_p.h \
                 gl2paintengineex/qglcustomshaderstage_p.h \
-                gl2paintengineex/qtriangulatingstroker_p.h 
+                gl2paintengineex/qtriangulatingstroker_p.h
 
     SOURCES +=  qglshaderprogram.cpp \
                 qglpixmapfilter.cpp \
@@ -142,18 +142,3 @@ embedded {
 }
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src
-
-contains(QT_CONFIG,opengles1) {
-    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1
-    LIBS += $$QMAKE_LFLAGS_OPENGL_ES1
-} else:contains(QT_CONFIG,opengles1cl) {
-    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES1CL
-    LIBS += $$QMAKE_LFLAGS_OPENGL_ES1CL
-} else:contains(QT_CONFIG,opengles2) {
-    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL_ES2
-    LIBS += $$QMAKE_LFLAGS_OPENGL_ES2
-} else {
-    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL
-    LIBS += $$QMAKE_LFLAGS_OPENGL
-}
-
-- 
cgit v0.12