1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt to removal of vulkan_support in qtbase

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2020-05-26 13:19:58 +02:00
parent c962b8c2df
commit 0d36b9c7d0
4 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/plugins/platforms/wayland/.prev_CMakeLists.txt
View File

@ -91,14 +91,6 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
## Scopes: ## 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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
LIBRARIES LIBRARIES
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
@ -119,6 +111,12 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
qwaylandclipboard.cpp qwaylandclipboard_p.h 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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
SOURCES SOURCES
qwaylandcursor.cpp qwaylandcursor_p.h qwaylandcursor.cpp qwaylandcursor_p.h

14
src/plugins/platforms/wayland/CMakeLists.txt
View File

@ -92,14 +92,6 @@ qt6_generate_wayland_protocol_client_sources(WaylandClient
## Scopes: ## 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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_xkbcommon
LIBRARIES LIBRARIES
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
@ -122,6 +114,12 @@ qt_extend_target(WaylandClient CONDITION QT_FEATURE_clipboard
qwaylandclipboard.cpp qwaylandclipboard_p.h 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 qt_extend_target(WaylandClient CONDITION QT_FEATURE_cursor
SOURCES SOURCES
qwaylandcursor.cpp qwaylandcursor_p.h qwaylandcursor.cpp qwaylandcursor_p.h

4
src/plugins/platforms/wayland/client.pro
View File

@ -5,10 +5,6 @@ QT += core-private gui-private
QT_FOR_PRIVATE += service_support-private QT_FOR_PRIVATE += service_support-private
QT_PRIVATE += fontdatabase_support-private eventdispatcher_support-private theme_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 # We have a bunch of C code with casts, so we can't have this option
QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual QMAKE_CXXFLAGS_WARN_ON -= -Wcast-qual

2
src/plugins/platforms/wayland/qwaylandvulkaninstance_p.h
View File

@ -46,7 +46,7 @@
#define VK_USE_PLATFORM_WAYLAND_KHR #define VK_USE_PLATFORM_WAYLAND_KHR
#include <QtVulkanSupport/private/qbasicvulkanplatforminstance_p.h> #include <QtGui/private/qbasicvulkanplatforminstance_p.h>
#include <QLibrary> #include <QLibrary>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE