From fc1ad8844d49aa7a3a6a218b8e5d1c84a1584548 Mon Sep 17 00:00:00 2001 From: Cryolitia Date: Fri, 4 Jul 2025 09:41:33 +0800 Subject: [PATCH] feat: use qt6-xcb-private-headers-dev Log: --- debian/rules | 3 --- xcb/linux.cmake | 6 +++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/rules b/debian/rules index e4aeb87..2ebb52e 100755 --- a/debian/rules +++ b/debian/rules @@ -17,8 +17,5 @@ PACK_VER = $(shell echo $(VERSION) | awk -F'[+_~-]' '{print $$1}') %: dh $@ -override_dh_auto_configure: - dh_auto_configure -- -DDTK_VERSION=$(PACK_VER) - override_dh_shlibdeps: dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info 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}")