diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-26 13:19:58 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-26 13:53:52 +0200 |
| commit | ddd4bbb2d4d234b8acc7f71065c1fc650ee1008e (patch) | |
| tree | 596847bcadd6f1e9459a72d1ea24c5e97653c1ac /src/hardwareintegration | |
| parent | cf2645bdd9e9c6fd512fafdedb03e0e6ec395ea0 (diff) | |
| download | qtwayland-ddd4bbb2d4d234b8acc7f71065c1fc650ee1008e.tar.gz | |
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>
Diffstat (limited to 'src/hardwareintegration')
| -rw-r--r-- | src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri | 3 | ||||
| -rw-r--r-- | src/hardwareintegration/compositor/vulkan-server/vulkanwrapper.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri b/src/hardwareintegration/compositor/vulkan-server/vulkan-server.pri index 63a96ad0..9a457a17 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 608609d6..6ab970f7 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> |