From f69853e8ba3fcd8ff1fab7fd68f97eabdb9dfb02 Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Thu, 26 Jan 2023 07:17:53 -0800 Subject: [PATCH] Qt: Include wayland QPA in AppImage (fixes #2796) --- CHANGES | 2 ++ src/platform/qt/CMakeLists.txt | 2 +- src/platform/qt/main.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 414a980e1..30c51c006 100644 --- a/CHANGES +++ b/CHANGES @@ -3,6 +3,8 @@ Emulation fixes: - GBA Memory: Make VRAM access stalls only apply to BG RAM Other fixes: - Qt: Fix crash when attempting to use OpenGL 2.1 to 3.1 (fixes mgba.io/i/2794) +Misc: + - Qt: Include wayland QPA in AppImage (fixes mgba.io/i/2796) 0.10.1: (2023-01-10) Emulation fixes: diff --git a/src/platform/qt/CMakeLists.txt b/src/platform/qt/CMakeLists.txt index 204f8e89a..f66be66aa 100644 --- a/src/platform/qt/CMakeLists.txt +++ b/src/platform/qt/CMakeLists.txt @@ -414,7 +414,7 @@ if(QT_STATIC) list(APPEND QT_LIBRARIES "-framework AVFoundation" "-framework CoreMedia" "-framework SystemConfiguration" "-framework Security") set_target_properties(${QT}::Core PROPERTIES INTERFACE_LINK_LIBRARIES "${QTPCRE}") elseif(UNIX) - list(APPEND QT_LIBRARIES ${QT}::FontDatabaseSupport ${QT}::XcbQpa) + list(APPEND QT_LIBRARIES ${QT}::FontDatabaseSupport ${QT}::XcbQpa ${QT}::QWaylandIntegrationPlugin) endif() endif() target_link_libraries(${BINARY_NAME}-qt ${PLATFORM_LIBRARY} ${BINARY_NAME} ${QT_LIBRARIES}) diff --git a/src/platform/qt/main.cpp b/src/platform/qt/main.cpp index 67668b011..acd28b3b7 100644 --- a/src/platform/qt/main.cpp +++ b/src/platform/qt/main.cpp @@ -38,6 +38,7 @@ Q_IMPORT_PLUGIN(AVFServicePlugin); #endif #elif defined(Q_OS_UNIX) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin); +Q_IMPORT_PLUGIN(QWaylandIntegrationPlugin); #endif #endif