1 files changed, 34 insertions, 31 deletions

diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index f4c39343a7..acad98a681 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -4,24 +4,25 @@
 ## OpenGL Module:
 #####################################################################
 
-add_qt_module(OpenGL
+qt_add_module(OpenGL
     SOURCES
-        gl2paintengineex/qgl2pexvertexarray.cpp gl2paintengineex/qgl2pexvertexarray_p.h
-        gl2paintengineex/qglcustomshaderstage.cpp gl2paintengineex/qglcustomshaderstage_p.h
-        gl2paintengineex/qglengineshadermanager.cpp gl2paintengineex/qglengineshadermanager_p.h
-        gl2paintengineex/qglengineshadersource_p.h
-        gl2paintengineex/qglgradientcache.cpp gl2paintengineex/qglgradientcache_p.h
-        gl2paintengineex/qglshadercache_p.h
-        gl2paintengineex/qpaintengineex_opengl2.cpp gl2paintengineex/qpaintengineex_opengl2_p.h
-        gl2paintengineex/qtextureglyphcache_gl.cpp gl2paintengineex/qtextureglyphcache_gl_p.h
-        qgl.cpp qgl.h qgl_p.h
-        qglbuffer.cpp qglbuffer.h
-        qglcolormap.cpp qglcolormap.h
-        qglframebufferobject.cpp qglframebufferobject.h qglframebufferobject_p.h
-        qglfunctions.cpp qglfunctions.h
-        qglpaintdevice.cpp qglpaintdevice_p.h
-        qglpixelbuffer.cpp qglpixelbuffer.h qglpixelbuffer_p.h
-        qglshaderprogram.cpp qglshaderprogram.h
+        qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
+        qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
+        qopengldebug.cpp qopengldebug.h
+        qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h
+        qopenglengineshadersource_p.h
+        qopenglgradientcache.cpp qopenglgradientcache_p.h
+        qopenglpaintdevice.cpp qopenglpaintdevice.h qopenglpaintdevice_p.h
+        qopenglpaintengine.cpp qopenglpaintengine_p.h
+        qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h
+        qopenglshadercache_p.h
+        qopengltexture.cpp qopengltexture.h qopengltexture_p.h
+        qopengltextureblitter.cpp qopengltextureblitter.h
+        qopengltexturecache.cpp qopengltexturecache_p.h
+        qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
+        qopengltexturehelper.cpp qopengltexturehelper_p.h
+        qopengltextureuploader.cpp qopengltextureuploader_p.h
+        qopenglwindow.cpp qopenglwindow.h
         qtopenglglobal.h
     DEFINES
         QT_NO_FOREACH
@@ -29,32 +30,34 @@ add_qt_module(OpenGL
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::Widgets
+    PRIVATE_MODULE_INTERFACE
+        Qt::CorePrivate
+        Qt::GuiPrivate
 )
 
-#### Keys ignored in scope 1:.:.:opengl.pro:<TRUE>:
-# _LOADED = "qt_module"
-
 ## Scopes:
 #####################################################################
 
-extend_target(OpenGL CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i386")
-    LINK_OPTIONS
-        "/BASE:0x63000000"
+qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets
+    SOURCES
+        qopenglwidget.cpp qopenglwidget.h
+    LIBRARIES
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Widgets
+    PRIVATE_MODULE_INTERFACE
+        Qt::WidgetsPrivate
 )
 
-#### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_:
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
-extend_target(OpenGL CONDITION QT_FEATURE_graphicseffect
+qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
     SOURCES
-        qgraphicsshadereffect.cpp qgraphicsshadereffect_p.h
+        qopenglqueryhelper_p.h
+        qopengltimerquery.cpp qopengltimerquery.h
 )
-add_qt_docs(OpenGL
+qt_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )