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/eglfs | |
| 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/eglfs')
| -rw-r--r-- | src/plugins/platforms/eglfs/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/api/vulkan/qeglfsvulkaninstance_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/eglfs/eglfsdeviceintegration.pro | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 0078c1f0d7..cef9b94859 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -53,8 +53,6 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h - PUBLIC_LIBRARIES - Qt::VulkanSupportPrivate ) # special case: diff --git a/src/plugins/platforms/eglfs/api/vulkan/qeglfsvulkaninstance_p.h b/src/plugins/platforms/eglfs/api/vulkan/qeglfsvulkaninstance_p.h index 9d6d47f439..7715cc37c0 100644 --- a/src/plugins/platforms/eglfs/api/vulkan/qeglfsvulkaninstance_p.h +++ b/src/plugins/platforms/eglfs/api/vulkan/qeglfsvulkaninstance_p.h @@ -52,7 +52,7 @@ // #include "qeglfsglobal_p.h" -#include <QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h> +#include <QtGui/private/qbasicvulkanplatforminstance_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro index bd02aea4d3..8bb7b614f1 100644 --- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro +++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro @@ -20,9 +20,6 @@ qtHaveModule(input_support-private): \ qtHaveModule(platformcompositor_support-private): \ QT += platformcompositor_support-private -qtConfig(vulkan): \ - QT += vulkan_support-private - # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 |