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/windows | |
| 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/windows')
| -rw-r--r-- | src/plugins/platforms/windows/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsvulkaninstance.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt index b8655ac69d..ba39c7567d 100644 --- a/src/plugins/platforms/windows/CMakeLists.txt +++ b/src/plugins/platforms/windows/CMakeLists.txt @@ -120,8 +120,6 @@ qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_accessibility qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_vulkan SOURCES qwindowsvulkaninstance.cpp qwindowsvulkaninstance.h - PUBLIC_LIBRARIES - Qt::VulkanSupportPrivate ) qt_extend_target(QWindowsIntegrationPlugin CONDITION QT_FEATURE_directwrite3 diff --git a/src/plugins/platforms/windows/qwindowsvulkaninstance.h b/src/plugins/platforms/windows/qwindowsvulkaninstance.h index cc7ef476d4..4b9293cc64 100644 --- a/src/plugins/platforms/windows/qwindowsvulkaninstance.h +++ b/src/plugins/platforms/windows/qwindowsvulkaninstance.h @@ -46,7 +46,7 @@ #define VK_USE_PLATFORM_WIN32_KHR -#include <QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h> +#include <QtGui/private/qbasicvulkanplatforminstance_p.h> #include <QtCore/qlibrary.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index b14969cc3a..ff5201e290 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -8,7 +8,6 @@ QT += \ qtHaveModule(platformcompositor_support-private): QT += platformcompositor_support-private qtConfig(accessibility): QT += accessibility_support-private -qtConfig(vulkan): QT += vulkan_support-private qtConfig(directwrite3): DEFINES *= QT_USE_DIRECTWRITE2 QT_USE_DIRECTWRITE3 |