1 files changed, 27 insertions, 9 deletions
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index a6e2e56561..52af12d683 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -1,4 +1,5 @@
-# Generated from opengl.pro.
+# Copyright (C) 2022 The Qt Company Ltd.
+# SPDX-License-Identifier: BSD-3-Clause
 
 #####################################################################
 ## OpenGL Module:
@@ -6,6 +7,7 @@
 
 qt_internal_add_module(OpenGL
     SOURCES
+        compat/removed_api.cpp
         qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
         qopenglbuffer.cpp qopenglbuffer.h
         qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
@@ -25,16 +27,22 @@ qt_internal_add_module(OpenGL
         qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
         qopengltexturehelper.cpp qopengltexturehelper_p.h
         qopengltextureuploader.cpp qopengltextureuploader_p.h
+        qopengltimerquery.h
         qopenglversionfunctions.cpp qopenglversionfunctions.h qopenglversionfunctions_p.h
         qopenglversionfunctionsfactory.cpp qopenglversionfunctionsfactory.h
         qopenglversionprofile.cpp qopenglversionprofile.h
-        qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
+        qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h qopenglvertexarrayobject_p.h
         qopenglwindow.cpp qopenglwindow.h
-        qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
         qtopenglglobal.h
+    NO_UNITY_BUILD_SOURCES
+        qopengltextureblitter.cpp       # qDebug()<< ambiguities
+    NO_PCH_SOURCES
+        compat/removed_api.cpp
     DEFINES
+        QT_NO_CONTEXTLESS_CONNECT
         QT_NO_FOREACH
         QT_NO_USING_NAMESPACE
+        QT_USE_NODISCARD_FILE_OPEN
     LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
@@ -49,6 +57,11 @@ qt_internal_add_module(OpenGL
 ## Scopes:
 #####################################################################
 
+qt_internal_extend_target(OpenGL CONDITION APPLE
+    NO_UNITY_BUILD_SOURCES
+        qopenglversionfunctionsfactory.cpp
+)
+
 qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
         qopenglfunctions_es2.cpp qopenglfunctions_es2.h
@@ -83,15 +96,17 @@ qt_internal_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
         qopenglfunctions_4_5_compatibility.cpp qopenglfunctions_4_5_compatibility.h
         qopenglfunctions_4_5_core.cpp qopenglfunctions_4_5_core.h
         qopenglqueryhelper_p.h
-        qopengltimerquery.cpp qopengltimerquery.h
+        qopengltimerquery.cpp
 )
 
 qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
     SOURCES
         qvkconvenience.cpp qvkconvenience_p.h
-    PUBLIC_LIBRARIES
-        Vulkan::Vulkan_nolink
 )
+if(QT_FEATURE_vulkan)
+    qt_internal_add_target_include_dirs_and_optionally_propagate(
+        OpenGL WrapVulkanHeaders::WrapVulkanHeaders)
+endif()
 
 qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl
     SOURCES
@@ -99,9 +114,12 @@ qt_internal_extend_target(OpenGL CONDITION QT_FEATURE_egl
         qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
 
-
-qt_internal_create_tracepoints(OpenGL qtopengl.tracepoints)
+qt_internal_generate_tracepoints(OpenGL opengl
+    SOURCES
+        qopenglframebufferobject.cpp
+        qopenglpaintengine.cpp
+        qopengltexturecache.cpp
+)
 qt_internal_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )
-