--- a/src/opengl/opengl.pro	Tue Jan 26 12:42:25 2010 +0200
+++ b/src/opengl/opengl.pro	Tue Feb 02 00:43:10 2010 +0200
@@ -15,14 +15,7 @@
 contains(QT_CONFIG, opengles1):CONFIG += opengles1
 contains(QT_CONFIG, opengles1cl):CONFIG += opengles1cl
 contains(QT_CONFIG, opengles2):CONFIG += opengles2
-
-contains(QT_CONFIG, opengles.*) {
-	for(p, QMAKE_LIBDIR_EGL) {
-		exists($$p):LIBS_PRIVATE += -L$$p
-	}
-	!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-	!isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL
-}
+contains(QT_CONFIG, egl):CONFIG += egl
 
 HEADERS += qgl.h \
 	   qgl_p.h \
@@ -61,7 +54,7 @@
                 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 \
@@ -103,7 +96,7 @@
             LIBS_PRIVATE += -lfreetype
         } else {
             ### Note: how does this compile with a non-system freetype?
-	    # This probably doesn't compile
+	    # This probably does not compile
         }
     } else {
         DEFINES *= QT_NO_FREETYPE
@@ -149,19 +142,3 @@
 }
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src
-
-wince*: {
-    contains(QT_CONFIG,opengles1) {
-        QMAKE_LIBS += "libGLES_CM.lib"
-    }
-    contains(QT_CONFIG,opengles1cl) {
-        QMAKE_LIBS += "libGLES_CL.lib"
-    }
-    contains(QT_CONFIG,opengles2) {
-        QMAKE_LIBS += "libGLESv2.lib"
-    }
-
-} else {
-    LIBS_PRIVATE += $$QMAKE_LIBS_OPENGL
-    LIBS += $$QMAKE_LFLAGS_OPENGL
-}