From abe3dbe719aa205c48d5a280eec4d73166430d74 Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Fri, 29 May 2020 18:02:17 +0200
Subject: [PATCH] CMake: Regenerate src/opengl

Change-Id: I6a648c5fd2fa90e6e70d0ccffb34fd3cb1161e5e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/opengl/.prev_CMakeLists.txt | 16 +++++++++++++++-
 src/opengl/CMakeLists.txt       |  6 ++----
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index 569fe18fc4..7fac433205 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -30,6 +30,7 @@ qt_add_module(OpenGL
         qopenglversionprofile.cpp qopenglversionprofile.h
         qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
         qopenglwindow.cpp qopenglwindow.h
+        qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
         qtopenglglobal.h
     DEFINES
         QT_NO_FOREACH
@@ -50,7 +51,7 @@ qt_add_module(OpenGL
 
 qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
-        opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h
+        qopenglfunctions_es2.cpp qopenglfunctions_es2.h
 )
 
 qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
@@ -84,6 +85,19 @@ qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
         qopenglqueryhelper_p.h
         qopengltimerquery.cpp qopengltimerquery.h
 )
+
+qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qvkconvenience.cpp qvkconvenience_p.h
+    PUBLIC_LIBRARIES
+        Vulkan::Vulkan_nolink
+)
+
+qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
+    SOURCES
+        qopenglcompositor.cpp qopenglcompositor_p.h
+        qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
+)
 qt_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )
diff --git a/src/opengl/CMakeLists.txt b/src/opengl/CMakeLists.txt
index 51d6240356..7fac433205 100644
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@@ -30,9 +30,8 @@ qt_add_module(OpenGL
         qopenglversionprofile.cpp qopenglversionprofile.h
         qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
         qopenglwindow.cpp qopenglwindow.h
-        qtopenglglobal.h
         qplatformbackingstoreopenglsupport.cpp qplatformbackingstoreopenglsupport.h
-
+        qtopenglglobal.h
     DEFINES
         QT_NO_FOREACH
         QT_NO_USING_NAMESPACE
@@ -96,10 +95,9 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_vulkan
 
 qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
     SOURCES
-        qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
         qopenglcompositor.cpp qopenglcompositor_p.h
+        qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )
-
 qt_add_docs(OpenGL
     doc/qtopengl.qdocconf
 )