From 0d36b9c7d0e43b8758b077ba8c20d22fdd0088ba Mon Sep 17 00:00:00 2001
From: Alexandru Croitor <alexandru.croitor@qt.io>
Date: Tue, 26 May 2020 13:19:58 +0200
Subject: [PATCH] Adapt to removal of vulkan_support in qtbase
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/plugins/platforms/wayland/.prev_CMakeLists.txt | 14 ++++++--------
 src/plugins/platforms/wayland/CMakeLists.txt       | 14 ++++++--------
 src/plugins/platforms/wayland/client.pro           |  4 ----
 .../platforms/wayland/qwaylandvulkaninstance_p.h   |  2 +-
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/plugins/platforms/wayland/.prev_CMakeLists.txt b/src/plugins/platforms/wayland/.prev_CMakeLists.txt
index 58861b94514..de526fceaee 100644
--- a/src/plugins/platforms/wayland/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/wayland/.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/plugins/platforms/wayland/CMakeLists.txt b/src/plugins/platforms/wayland/CMakeLists.txt
index 597321a2ce2..af045bb8312 100644
--- a/src/plugins/platforms/wayland/CMakeLists.txt
+++ b/src/plugins/platforms/wayland/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/plugins/platforms/wayland/client.pro b/src/plugins/platforms/wayland/client.pro
index 4aeba860bc5..3355d663573 100644
--- a/src/plugins/platforms/wayland/client.pro
+++ b/src/plugins/platforms/wayland/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/plugins/platforms/wayland/qwaylandvulkaninstance_p.h b/src/plugins/platforms/wayland/qwaylandvulkaninstance_p.h
index b68293b78d2..3f565ed2454 100644
--- a/src/plugins/platforms/wayland/qwaylandvulkaninstance_p.h
+++ b/src/plugins/platforms/wayland/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