1 files changed, 55 insertions, 45 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index 8b2349ff2f..bf4ba63053 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -1,57 +1,67 @@
 TARGET     = QtOpenGL
-QT         = core-private gui-private widgets-private
+QT         = core-private gui-private
 
 DEFINES   += QT_NO_USING_NAMESPACE QT_NO_FOREACH
 
-msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x63000000
-solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
-
 QMAKE_DOCS = $$PWD/doc/qtopengl.qdocconf
 
 qtConfig(opengl): CONFIG += opengl
 qtConfig(opengles2): CONFIG += opengles2
 
-HEADERS += qgl.h \
-           qgl_p.h \
-           qglcolormap.h \
-           qglfunctions.h \
-           qglpixelbuffer.h \
-           qglpixelbuffer_p.h \
-           qglframebufferobject.h  \
-           qglframebufferobject_p.h  \
-           qglpaintdevice_p.h \
-           qglbuffer.h \
-           qtopenglglobal.h
-
-SOURCES += qgl.cpp \
-           qglcolormap.cpp \
-           qglfunctions.cpp \
-           qglpixelbuffer.cpp \
-           qglframebufferobject.cpp \
-           qglpaintdevice.cpp \
-           qglbuffer.cpp \
-
-HEADERS +=  qglshaderprogram.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/qtextureglyphcache_gl_p.h \
-            gl2paintengineex/qglshadercache_p.h
-
-SOURCES +=  qglshaderprogram.cpp \
-            gl2paintengineex/qglgradientcache.cpp \
-            gl2paintengineex/qglengineshadermanager.cpp \
-            gl2paintengineex/qgl2pexvertexarray.cpp \
-            gl2paintengineex/qpaintengineex_opengl2.cpp \
-            gl2paintengineex/qglcustomshaderstage.cpp \
-            gl2paintengineex/qtextureglyphcache_gl.cpp
-
-qtConfig(graphicseffect) {
-    HEADERS += qgraphicsshadereffect_p.h
-    SOURCES += qgraphicsshadereffect.cpp
+HEADERS += \
+    qopengl2pexvertexarray_p.h \
+    qopenglbuffer.h \
+    qopenglcustomshaderstage_p.h \
+    qopengldebug.h \
+    qopenglengineshadermanager_p.h \
+    qopenglengineshadersource_p.h \
+    qopenglframebufferobject.h \
+    qopenglframebufferobject_p.h \
+    qopenglgradientcache_p.h \
+    qopenglpaintdevice.h \
+    qopenglpaintdevice_p.h \
+    qopenglpaintengine_p.h \
+    qopenglpixeltransferoptions.h \
+    qopenglshadercache_p.h \
+    qopenglshaderprogram.h \
+    qopengltexture.h \
+    qopengltexture_p.h \
+    qopengltexturehelper_p.h \
+    qopengltextureblitter.h \
+    qopengltexturecache_p.h \
+    qopengltextureglyphcache_p.h \
+    qopengltextureuploader_p.h \
+    qopenglvertexarrayobject.h \
+    qopenglwindow.h \
+    qtopenglglobal.h
+
+SOURCES += \
+    qopengl2pexvertexarray.cpp \
+    qopenglbuffer.cpp \
+    qopenglcustomshaderstage.cpp \
+    qopenglengineshadermanager.cpp \
+    qopenglframebufferobject.cpp \
+    qopenglgradientcache.cpp \
+    qopenglpaintdevice.cpp \
+    qopenglpaintengine.cpp \
+    qopenglpixeltransferoptions.cpp \
+    qopenglshaderprogram.cpp \
+    qopengltexture.cpp \
+    qopengltexturehelper.cpp \
+    qopengltextureblitter.cpp \
+    qopengltexturecache.cpp \
+    qopengltextureglyphcache.cpp \
+    qopengltextureuploader.cpp \
+    qopenglvertexarrayobject.cpp \
+    qopenglwindow.cpp \
+    qopengldebug.cpp
+
+!qtConfig(opengles2) {
+    HEADERS += \
+        qopenglqueryhelper_p.h \
+        qopengltimerquery.h
+
+    SOURCES += qopengltimerquery.cpp
 }
 
 load(qt_module)