1 files changed, 8 insertions, 57 deletions

diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index e2dc011532..7c1c0ce5fd 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -2,7 +2,7 @@ load(qt_module)
 
 TARGET     = QtOpenGL
 QPRO_PWD   = $$PWD
-QT         = core-private gui-private
+QT         = core-private gui-private widgets-private
 
 CONFIG += module
 MODULE_PRI = ../modules/qt_opengl.pri
@@ -19,7 +19,7 @@ load(qt_module_config)
 
 HEADERS += $$QT_SOURCE_TREE/src/opengl/qtopenglversion.h
 
-!win32:!embedded:!mac:!symbian:!qpa:CONFIG	   += x11
+!win32:!embedded:!mac:!qpa:CONFIG	   += x11
 contains(QT_CONFIG, opengl):CONFIG += opengl
 contains(QT_CONFIG, opengles1):CONFIG += opengles1
 contains(QT_CONFIG, opengles2):CONFIG += opengles2
@@ -57,9 +57,6 @@ SOURCES += qgl.cpp \
     HEADERS +=  qglshaderprogram.h \
                 qglpixmapfilter_p.h  \
                 qgraphicsshadereffect_p.h \
-                qgraphicssystem_gl_p.h \
-                qwindowsurface_gl_p.h \
-                qpixmapdata_gl_p.h \
                 gl2paintengineex/qglgradientcache_p.h \
                 gl2paintengineex/qglengineshadermanager_p.h \
                 gl2paintengineex/qgl2pexvertexarray_p.h \
@@ -76,9 +73,6 @@ SOURCES += qgl.cpp \
     SOURCES +=  qglshaderprogram.cpp \
                 qglpixmapfilter.cpp \
                 qgraphicsshadereffect.cpp \
-                qgraphicssystem_gl.cpp \
-                qwindowsurface_gl.cpp \
-                qpixmapdata_gl.cpp \
                 gl2paintengineex/qglgradientcache.cpp \
                 gl2paintengineex/qglengineshadermanager.cpp \
                 gl2paintengineex/qgl2pexvertexarray.cpp \
@@ -99,13 +93,9 @@ x11 {
     contains(QT_CONFIG, egl) {
         SOURCES +=  qgl_x11egl.cpp \
                     qglpixelbuffer_egl.cpp \
-                    qgl_egl.cpp \
-                    qpixmapdata_x11gl_egl.cpp \
-                    qwindowsurface_x11gl.cpp
+                    qgl_egl.cpp
 
-        HEADERS +=  qgl_egl_p.h \
-                    qpixmapdata_x11gl_p.h \
-                    qwindowsurface_x11gl_p.h
+        HEADERS +=  qgl_egl_p.h
 
     } else {
         SOURCES +=  qgl_x11.cpp \
@@ -114,7 +104,6 @@ x11 {
 
     contains(QT_CONFIG, fontconfig) {
         contains(QT_CONFIG, system-freetype) {
-            embedded:CONFIG += opentype
             # pull in the proper freetype2 include directory
             include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
             LIBS_PRIVATE += -lfreetype
@@ -136,8 +125,10 @@ mac:!qpa {
 }
 win32:!wince*: {
     DEFINES += QT_NO_EGL
-    SOURCES += qgl_win.cpp \
-	           qglpixelbuffer_win.cpp
+    !qpa {
+        SOURCES += qgl_win.cpp \
+                       qglpixelbuffer_win.cpp
+    }
 }
 wince*: {
     SOURCES += qgl_wince.cpp \
@@ -147,44 +138,4 @@ wince*: {
     HEADERS += qgl_egl_p.h
 }
 
-embedded {
-    SOURCES += qgl_qws.cpp \
-               qglpixelbuffer_egl.cpp \
-               qglscreen_qws.cpp \
-               qglwindowsurface_qws.cpp \
-               qgl_egl.cpp
-
-    HEADERS += qglscreen_qws.h \
-               qglwindowsurface_qws_p.h \
-               qgl_egl_p.h
-
-    contains(QT_CONFIG, fontconfig) {
-        include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri)
-    } else {
-       DEFINES *= QT_NO_FREETYPE
-    }
-}
-
-symbian {
-    DEFINES += QGL_USE_TEXTURE_POOL QGL_NO_PRESERVED_SWAP
-    SOURCES -= qpixmapdata_gl.cpp
-    SOURCES += qgl_symbian.cpp \
-               qpixmapdata_poolgl.cpp \
-               qglpixelbuffer_egl.cpp \
-               qgl_egl.cpp \
-               qgltexturepool.cpp
-
-    HEADERS += qgl_egl_p.h \
-               qgltexturepool_p.h
-
-    contains(QT_CONFIG, freetype) {
-        DEFINES += QT_NO_FONTCONFIG
-        INCLUDEPATH += \
-            ../3rdparty/freetype/src \
-            ../3rdparty/freetype/include
-    }
-
-    symbian:TARGET.UID3 = 0x2002131A
-}
-
 INCLUDEPATH += ../3rdparty/harfbuzz/src