1 files changed, 30 insertions, 90 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 7c1c0ce5fd..52429c80b0 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -47,95 +47,35 @@ SOURCES += qgl.cpp \
            qglpaintdevice.cpp \
            qglbuffer.cpp \
 
-
-!contains(QT_CONFIG, opengles2) {
-    HEADERS += qpaintengine_opengl_p.h
-    SOURCES += qpaintengine_opengl.cpp
-}
-
-!contains(QT_CONFIG, opengles1) {
-    HEADERS +=  qglshaderprogram.h \
-                qglpixmapfilter_p.h  \
-                qgraphicsshadereffect_p.h \
-                gl2paintengineex/qglgradientcache_p.h \
-                gl2paintengineex/qglengineshadermanager_p.h \
-                gl2paintengineex/qgl2pexvertexarray_p.h \
-                gl2paintengineex/qpaintengineex_opengl2_p.h \
-                gl2paintengineex/qglengineshadersource_p.h \
-                gl2paintengineex/qglcustomshaderstage_p.h \
-                gl2paintengineex/qtriangulatingstroker_p.h \
-                gl2paintengineex/qtriangulator_p.h \
-                gl2paintengineex/qrbtree_p.h \
-                gl2paintengineex/qtextureglyphcache_gl_p.h \
-                gl2paintengineex/qglshadercache_p.h \
-                gl2paintengineex/qglshadercache_meego_p.h
-
-    SOURCES +=  qglshaderprogram.cpp \
-                qglpixmapfilter.cpp \
-                qgraphicsshadereffect.cpp \
-                gl2paintengineex/qglgradientcache.cpp \
-                gl2paintengineex/qglengineshadermanager.cpp \
-                gl2paintengineex/qgl2pexvertexarray.cpp \
-                gl2paintengineex/qpaintengineex_opengl2.cpp \
-                gl2paintengineex/qglcustomshaderstage.cpp \
-                gl2paintengineex/qtriangulatingstroker.cpp \
-                gl2paintengineex/qtriangulator.cpp \
-                gl2paintengineex/qtextureglyphcache_gl.cpp
-
-}
-
-qpa {
-    SOURCES +=  qgl_qpa.cpp \
-                qglpixelbuffer_stub.cpp
-}
-
-x11 {
-    contains(QT_CONFIG, egl) {
-        SOURCES +=  qgl_x11egl.cpp \
-                    qglpixelbuffer_egl.cpp \
-                    qgl_egl.cpp
-
-        HEADERS +=  qgl_egl_p.h
-
-    } else {
-        SOURCES +=  qgl_x11.cpp \
-                    qglpixelbuffer_x11.cpp
-    }
-
-    contains(QT_CONFIG, fontconfig) {
-        contains(QT_CONFIG, system-freetype) {
-            # pull in the proper freetype2 include directory
-            include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-            LIBS_PRIVATE += -lfreetype
-        } else {
-            ### Note: how does this compile with a non-system freetype?
-	    # This probably does not compile
-        }
-    } else {
-        DEFINES *= QT_NO_FREETYPE
-    }
-
-    LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD
-}
-
-mac:!qpa {
-    OBJECTIVE_SOURCES += qgl_mac.mm \
-                         qglpixelbuffer_mac.mm
-    LIBS_PRIVATE += -framework AppKit -framework Carbon
-}
-win32:!wince*: {
-    DEFINES += QT_NO_EGL
-    !qpa {
-        SOURCES += qgl_win.cpp \
-                       qglpixelbuffer_win.cpp
-    }
-}
-wince*: {
-    SOURCES += qgl_wince.cpp \
-               qglpixelbuffer_egl.cpp \
-               qgl_egl.cpp
-
-    HEADERS += qgl_egl_p.h
-}
+HEADERS +=  qglshaderprogram.h \
+            qgraphicsshadereffect_p.h \
+            gl2paintengineex/qglgradientcache_p.h \
+            gl2paintengineex/qglengineshadermanager_p.h \
+            gl2paintengineex/qgl2pexvertexarray_p.h \
+            gl2paintengineex/qpaintengineex_opengl2_p.h \
+            gl2paintengineex/qglengineshadersource_p.h \
+            gl2paintengineex/qglcustomshaderstage_p.h \
+            gl2paintengineex/qtriangulatingstroker_p.h \
+            gl2paintengineex/qtriangulator_p.h \
+            gl2paintengineex/qrbtree_p.h \
+            gl2paintengineex/qtextureglyphcache_gl_p.h \
+            gl2paintengineex/qglshadercache_p.h \
+            gl2paintengineex/qglshadercache_meego_p.h
+
+SOURCES +=  qglshaderprogram.cpp \
+            qgraphicsshadereffect.cpp \
+            gl2paintengineex/qglgradientcache.cpp \
+            gl2paintengineex/qglengineshadermanager.cpp \
+            gl2paintengineex/qgl2pexvertexarray.cpp \
+            gl2paintengineex/qpaintengineex_opengl2.cpp \
+            gl2paintengineex/qglcustomshaderstage.cpp \
+            gl2paintengineex/qtriangulatingstroker.cpp \
+            gl2paintengineex/qtriangulator.cpp \
+            gl2paintengineex/qtextureglyphcache_gl.cpp
+
+SOURCES +=  qgl_qpa.cpp \
+            qglpixelbuffer_stub.cpp
+
+DEFINES += QT_NO_EGL
 
 INCLUDEPATH += ../3rdparty/harfbuzz/src