Adapt to removal of vulkan_support in qtbase

QtVulkanSupport module has been removed and its content was merged
into QtGui and QtOpenGL in 7a1650e34331f87bab5a9372087d2a1135f9f63a
in qtbase.

Change-Id: I33b567208aebfeb15350ea088cb7fcd092e2a48a
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

8 files changed, 16 insertions, 26 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 33eee0c01..b991c62e6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
     PlatformCompositorSupport
     Quick
     ServiceSupport
-    VulkanSupport
     XkbCommonSupport
 )
 # special case end
diff --git a/src/client/.prev_CMakeLists.txt b/src/client/.prev_CMakeLists.txt
index 58861b945..de526fcea 100644
--- a/src/client/.prev_CMakeLists.txt
+++ b/src/client/.prev_CMakeLists.txt
@@ -91,14 +91,6 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h
-        qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h
-    LIBRARIES
-        Qt::VulkanSupportPrivate
-)
-
 qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         Qt::XkbCommonSupportPrivate
@@ -119,6 +111,12 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
         qwaylandclipboard.cpp qwaylandclipboard_p.h
 )
 
+qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h
+        qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h
+)
+
 qt_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
     SOURCES
         qwaylandcursor.cpp qwaylandcursor_p.h
diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt
index 597321a2c..af045bb83 100644
--- a/src/client/CMakeLists.txt
+++ b/src/client/CMakeLists.txt
@@ -92,14 +92,6 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
 ## Scopes:
 #####################################################################
 
-qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
-    SOURCES
-        qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h
-        qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h
-    LIBRARIES
-        Qt::VulkanSupportPrivate
-)
-
 qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
     LIBRARIES
         Qt::XkbCommonSupportPrivate
@@ -122,6 +114,12 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
         qwaylandclipboard.cpp qwaylandclipboard_p.h
 )
 
+qt_extend_target(WaylandClient CONDITION QT_FEATURE_vulkan
+    SOURCES
+        qwaylandvulkaninstance.cpp qwaylandvulkaninstance_p.h
+        qwaylandvulkanwindow.cpp qwaylandvulkanwindow_p.h
+)
+
 qt_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
     SOURCES
         qwaylandcursor.cpp qwaylandcursor_p.h
diff --git a/src/client/client.pro b/src/client/client.pro
index 4aeba860b..3355d6635 100644
--- a/src/client/client.pro
+++ b/src/client/client.pro
@@ -5,10 +5,6 @@ QT += core-private gui-private
 QT_FOR_PRIVATE += service_support-private
 QT_PRIVATE += fontdatabase_support-private eventdispatcher_support-private theme_support-private
 
-qtConfig(vulkan) {
-    QT_PRIVATE += vulkan_support-private
-}
-
 # We have a bunch of C code with casts, so we can't have this option
 QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual
 
diff --git a/src/client/qwaylandvulkaninstance_p.h b/src/client/qwaylandvulkaninstance_p.h
index b68293b78..3f565ed24 100644
--- a/src/client/qwaylandvulkaninstance_p.h
+++ b/src/client/qwaylandvulkaninstance_p.h
@@ -46,7 +46,7 @@
 
 #define VK_USE_PLATFORM_WAYLAND_KHR
 
-#include <QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h>
+#include <QtGui/private/qbasicvulkanplatforminstance_p.h>
 #include <QLibrary>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri b/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri
index 63a96ad0f..9a457a173 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri
@@ -1,8 +1,7 @@
 INCLUDEPATH += $$PWD $$PWD/../../../3rdparty/util
 
-QT += vulkan_support-private
-
 QMAKE_USE_PRIVATE += wayland-server
+QT += opengl-private
 
 SOURCES += \
     $$PWD/vulkanserverbufferintegration.cpp \
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
index 608609d6c..6ab970f78 100644
--- a/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
+++ b/src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp
@@ -36,7 +36,7 @@
 #include <QImage>
 #include <QOpenGLContext>
 #include <QtGui/qopengl.h>
-#include <QtVulkanSupport/private/qvkconvenience_p.h>
+#include <QtOpenGL/private/qvkconvenience_p.h>
 
 #include <set>
 
diff --git a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
index 8a6c03add..661cdac9b 100644
--- a/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
+++ b/src/plugins/hardwareintegration/compositor/vulkan-server/CMakeLists.txt
@@ -19,7 +19,7 @@ qt_internal_add_plugin(VulkanServerBufferIntegrationPlugin
     PUBLIC_LIBRARIES
         Qt::CorePrivate
         Qt::GuiPrivate
-        Qt::VulkanSupportPrivate
+        Qt::OpenGLPrivate
         Qt::WaylandCompositor
         Qt::WaylandCompositorPrivate
 )