Post-merge fixes

Change-Id: I6acd29103f6cc550544e7422328d97ea0e2dcafb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

11 files changed, 71 insertions, 73 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bb2b8a6ee2..ea62fa8b34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -35,14 +35,12 @@ if(QT_FEATURE_gui)
     add_subdirectory(gui)
 
     if(QT_FEATURE_opengl)
+        add_subdirectory(opengl)
         add_subdirectory(openglextensions)
     endif()
 
     if(QT_FEATURE_widgets)
         add_subdirectory(widgets)
-        if(QT_FEATURE_opengl)
-            add_subdirectory(opengl)
-        endif()
     endif()
     add_subdirectory(platformsupport)
     add_subdirectory(platformheaders)
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 5c287261fb..a6e862e1de 100644
--- a/src/corelib/.prev_CMakeLists.txt
+++ b/src/corelib/.prev_CMakeLists.txt
@@ -194,6 +194,7 @@ qt_add_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qduplicatetracker_p.h
         tools/qflatmap_p.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
@@ -612,17 +613,18 @@ qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXW
         m
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX AND NOT NACL
+qt_extend_target(Core CONDITION APPLE AND NOT NACL
     SOURCES
+        kernel/qelapsedtimer_mac.cpp
         text/qlocale_mac.mm
 )
 
-qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX)
+qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_unix.cpp
 )
 
-qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX)
+qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_win.cpp
 )
@@ -894,11 +896,6 @@ qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT NACL
-    SOURCES
-        kernel/qelapsedtimer_mac.cpp
-)
-
 qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
     LIBRARIES
         ${FWUIKit}
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
index 5a0ef2eb4d..ca53e47ac3 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
@@ -208,6 +208,7 @@ qt_add_module(Core
         tools/qcontainertools_impl.h
         tools/qcontiguouscache.cpp tools/qcontiguouscache.h
         tools/qcryptographichash.cpp tools/qcryptographichash.h
+        tools/qduplicatetracker_p.h
         tools/qflatmap_p.h
         tools/qfreelist.cpp tools/qfreelist_p.h
         tools/qhash.cpp tools/qhash.h
@@ -688,17 +689,18 @@ qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXW
         m
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX AND NOT NACL
+qt_extend_target(Core CONDITION APPLE AND NOT NACL
     SOURCES
+        kernel/qelapsedtimer_mac.cpp
         text/qlocale_mac.mm
 )
 
-qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE_OSX)
+qt_extend_target(Core CONDITION UNIX AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_unix.cpp
 )
 
-qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE_OSX)
+qt_extend_target(Core CONDITION WIN32 AND (NACL OR NOT APPLE)
     SOURCES
         text/qlocale_win.cpp
 )
@@ -970,11 +972,6 @@ qt_extend_target(Core CONDITION QT_FEATURE_dlopen AND QT_FEATURE_library
         ${CMAKE_DL_LIBS}
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT NACL
-    SOURCES
-        kernel/qelapsedtimer_mac.cpp
-)
-
 qt_extend_target(Core CONDITION APPLE AND (APPLE_IOS OR APPLE_TVOS)
     LIBRARIES
         ${FWUIKit}
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 75af1f1960..14f17d832e 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -253,28 +253,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
         kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
         kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
         opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
-        opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
         opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
-        opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
-        opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
-        opengl/qopenglengineshadersource_p.h
         opengl/qopenglextensions_p.h
         opengl/qopenglextrafunctions.h
         opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h
         opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
-        opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h
-        opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h
-        opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h
-        opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h
         opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
-        opengl/qopenglshadercache_p.h
         opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
-        opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h
         opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
-        opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h
-        opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h
-        opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h
-        opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h
         opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
         opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
         opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 3c8f35f467..c5d7c73a49 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -335,28 +335,14 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
         kernel/qopenglcontext.cpp kernel/qopenglcontext.h kernel/qopenglcontext_p.h
         kernel/qplatformopenglcontext.cpp kernel/qplatformopenglcontext.h
         opengl/qopengl.cpp opengl/qopengl.h opengl/qopengl_p.h
-        opengl/qopengl2pexvertexarray.cpp opengl/qopengl2pexvertexarray_p.h
         opengl/qopenglbuffer.cpp opengl/qopenglbuffer.h
-        opengl/qopenglcustomshaderstage.cpp opengl/qopenglcustomshaderstage_p.h
-        opengl/qopenglengineshadermanager.cpp opengl/qopenglengineshadermanager_p.h
-        opengl/qopenglengineshadersource_p.h
         opengl/qopenglextensions_p.h
         opengl/qopenglextrafunctions.h
         opengl/qopenglframebufferobject.cpp opengl/qopenglframebufferobject.h opengl/qopenglframebufferobject_p.h
         opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
-        opengl/qopenglgradientcache.cpp opengl/qopenglgradientcache_p.h
-        opengl/qopenglpaintdevice.cpp opengl/qopenglpaintdevice.h opengl/qopenglpaintdevice_p.h
-        opengl/qopenglpaintengine.cpp opengl/qopenglpaintengine_p.h
-        opengl/qopenglpixeltransferoptions.cpp opengl/qopenglpixeltransferoptions.h
         opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
-        opengl/qopenglshadercache_p.h
         opengl/qopenglshaderprogram.cpp opengl/qopenglshaderprogram.h
-        opengl/qopengltexture.cpp opengl/qopengltexture.h opengl/qopengltexture_p.h
         opengl/qopengltextureblitter.cpp opengl/qopengltextureblitter.h
-        opengl/qopengltexturecache.cpp opengl/qopengltexturecache_p.h
-        opengl/qopengltextureglyphcache.cpp opengl/qopengltextureglyphcache_p.h
-        opengl/qopengltexturehelper.cpp opengl/qopengltexturehelper_p.h
-        opengl/qopengltextureuploader.cpp opengl/qopengltextureuploader_p.h
         opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
         opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
         opengl/qopenglvertexarrayobject.cpp opengl/qopenglvertexarrayobject.h
diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index 85e382fa16..fdd0ff7beb 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -6,22 +6,22 @@
 
 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
+        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,27 +29,27 @@ qt_add_module(OpenGL
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::WidgetsPrivate
     PUBLIC_LIBRARIES
         Qt::Core
         Qt::Gui
-        Qt::Widgets
 )
 
 ## Scopes:
 #####################################################################
 
-qt_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
 )
 
-#### Keys ignored in scope 3:.:.:opengl.pro:solaris-cc_x_:
-# QMAKE_CXXFLAGS_RELEASE = "--O2"
-
-qt_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
 )
 qt_add_docs(OpenGL
     doc/qtopengl.qdocconf
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index d490aa4970..fdd0ff7beb 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -6,7 +6,21 @@
 
 qt_add_module(OpenGL
     SOURCES
+        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
+        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
diff --git a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
index 070a0ee35f..b283b6df4d 100644
--- a/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
+++ b/src/platformsupport/vkconvenience/.prev_CMakeLists.txt
@@ -24,3 +24,11 @@ qt_add_module(VulkanSupport
 
 #### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>:
 # MODULE = "vulkan_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt
index 99435d1f55..521fa098ea 100644
--- a/src/platformsupport/vkconvenience/CMakeLists.txt
+++ b/src/platformsupport/vkconvenience/CMakeLists.txt
@@ -26,3 +26,11 @@ qt_add_module(VulkanSupport
 
 #### Keys ignored in scope 1:.:.:vkconvenience.pro:<TRUE>:
 # MODULE = "vulkan_support"
+
+## Scopes:
+#####################################################################
+
+qt_extend_target(VulkanSupport CONDITION QT_FEATURE_opengl
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
+)
diff --git a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
index c7bf3f7c7c..8f04c3fba0 100644
--- a/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/.prev_CMakeLists.txt
@@ -37,6 +37,8 @@ qt_add_plugin(QMinimalEglIntegrationPlugin
 qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qminimaleglbackingstore.cpp qminimaleglbackingstore.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
 )
 
 #### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
diff --git a/src/plugins/platforms/minimalegl/CMakeLists.txt b/src/plugins/platforms/minimalegl/CMakeLists.txt
index 7c549a416b..79cc6bddc6 100644
--- a/src/plugins/platforms/minimalegl/CMakeLists.txt
+++ b/src/plugins/platforms/minimalegl/CMakeLists.txt
@@ -38,6 +38,8 @@ qt_add_plugin(QMinimalEglIntegrationPlugin
 qt_extend_target(QMinimalEglIntegrationPlugin CONDITION QT_FEATURE_opengl
     SOURCES
         qminimaleglbackingstore.cpp qminimaleglbackingstore.h
+    PUBLIC_LIBRARIES
+        Qt::OpenGL
 )
 
 #### Keys ignored in scope 3:.:.:minimalegl.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: