From 4139ec73a0a42bafe331a8870be880559105fa60 Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Tue, 8 Jul 2025 07:07:34 +0000 Subject: [PATCH] sync: from linuxdeepin/qt5platform-plugins Synchronize source files from linuxdeepin/qt5platform-plugins. Source-pull-request: https://github.com/linuxdeepin/qt5platform-plugins/pull/296 --- .syncexclude | 1 + xcb/linux.cmake | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.syncexclude b/.syncexclude index 023f1c5..8f9fa9f 100644 --- a/.syncexclude +++ b/.syncexclude @@ -8,3 +8,4 @@ # * .github # are always ignored VERSION +CHANGELOG.md diff --git a/xcb/linux.cmake b/xcb/linux.cmake index 526140e..b2f8f3a 100644 --- a/xcb/linux.cmake +++ b/xcb/linux.cmake @@ -85,7 +85,11 @@ else() message(FATAL_ERROR "Not support Qt Version: ${Qt5_VERSION}") endif() elseif(${QT_VERSION_MAJOR} STREQUAL "6") - if(EXISTS ${CMAKE_CURRENT_LIST_DIR}/libqt6xcbqpa-dev/${Qt6_VERSION}) + list(GET Qt6Core_INCLUDE_DIRS 0 dir) + string(REPLACE "QtCore" "QtXcb" Qt6Xcb_INCLUDE_DIR ${dir}) + if(EXISTS ${Qt6Xcb_INCLUDE_DIR}/${Qt6_VERSION}/QtXcb/private) + include_directories(${Qt6Xcb_INCLUDE_DIR}/${Qt6_VERSION}/QtXcb/private) + elseif(EXISTS ${CMAKE_CURRENT_LIST_DIR}/libqt6xcbqpa-dev/${Qt6_VERSION}) include_directories(${CMAKE_CURRENT_LIST_DIR}/libqt6xcbqpa-dev/${Qt6_VERSION}) else() message(FATAL_ERROR "Not support Qt Version: ${Qt6_VERSION}")