diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-31 12:25:43 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-05-22 15:38:28 +0200 |
| commit | 7a1650e34331f87bab5a9372087d2a1135f9f63a (patch) | |
| tree | ef3c6949722b9521cd672d55fdad6d69353947b1 /src/plugins/platforms/xcb | |
| parent | 948134371eb3ea5a4b4237f4e1f1399d90562ded (diff) | |
Move QtVulkanSupport into QtGui and QtOpenGL
Task-number: QTBUG-83255
Change-Id: Ib021cecebda89fa2ab9332752124a8cec0a51a10
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbvulkaninstance.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb_qpa_lib.pro | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index a7cb58ba29..278ef82cb8 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -81,8 +81,6 @@ qt_extend_target(XcbQpa CONDITION QT_FEATURE_vulkan SOURCES qxcbvulkaninstance.cpp qxcbvulkaninstance.h qxcbvulkanwindow.cpp qxcbvulkanwindow.h - PUBLIC_LIBRARIES - Qt::VulkanSupportPrivate ) qt_extend_target(XcbQpa CONDITION QT_FEATURE_glib diff --git a/src/plugins/platforms/xcb/qxcbvulkaninstance.h b/src/plugins/platforms/xcb/qxcbvulkaninstance.h index 53f7345254..abf8935e6a 100644 --- a/src/plugins/platforms/xcb/qxcbvulkaninstance.h +++ b/src/plugins/platforms/xcb/qxcbvulkaninstance.h @@ -46,7 +46,7 @@ #define VK_USE_PLATFORM_XCB_KHR -#include <QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h> +#include <QtGui/private/qbasicvulkanplatforminstance_p.h> #include <QLibrary> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 1f651e7697..8154d300b1 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -15,8 +15,6 @@ qtHaveModule(platformcompositor_support-private): \ qtHaveModule(linuxaccessibility_support-private): \ QT += linuxaccessibility_support-private -qtConfig(vulkan): QT += vulkan_support-private - qtConfig(glib) : QMAKE_USE_PRIVATE += glib SOURCES = \ |