From 5cd386a419dceb709b8e3fcb17a7c9e47ad4288b Mon Sep 17 00:00:00 2001
From: Yuhang Zhao <2546789017@qq.com>
Date: Wed, 25 Jan 2023 13:49:06 +0800
Subject: [PATCH] qmake: adapt latest cmake changes

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
---
 qmake/core.pri    | 10 ++++++++--
 qmake/quick.pri   |  8 +++++++-
 qmake/widgets.pri | 10 ++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/qmake/core.pri b/qmake/core.pri
index c91662e..3f65b00 100644
--- a/qmake/core.pri
+++ b/qmake/core.pri
@@ -1,6 +1,8 @@
 QT += core core-private gui gui-private
 
-CORE_PUB_INC_DIR = $$PWD/../include/FramelessHelper/Core
+BASE_INC_DIR = $$PWD/../include
+COMMON_INC_DIR = $$BASE_INC_DIR/FramelessHelper
+CORE_PUB_INC_DIR = $$COMMON_INC_DIR/Core
 CORE_PRIV_INC_DIR = $$CORE_PUB_INC_DIR/private
 CORE_EXTRA_INC_DIR = $$PWD/inc/core
 CORE_SRC_DIR = $$PWD/../src/core
@@ -9,11 +11,15 @@ DEFINES += \
     FRAMELESSHELPER_CORE_STATIC
 
 INCLUDEPATH += \
+    $$BASE_INC_DIR \
+    $$COMMON_INC_DIR \
     $$CORE_PUB_INC_DIR \
     $$CORE_PRIV_INC_DIR \
     $$CORE_EXTRA_INC_DIR
 
 DEPENDPATH += \
+    $$BASE_INC_DIR \
+    $$COMMON_INC_DIR \
     $$CORE_PUB_INC_DIR \
     $$CORE_PRIV_INC_DIR \
     $$CORE_EXTRA_INC_DIR
@@ -65,7 +71,7 @@ win32 {
 
 unix:!macx {
     CONFIG += link_pkgconfig
-    PKGCONFIG += gtk+-3.0
+    PKGCONFIG += xcb gtk+-3.0
     DEFINES += GDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6
     HEADERS += \
         $$CORE_PUB_INC_DIR/framelesshelper_linux.h
diff --git a/qmake/quick.pri b/qmake/quick.pri
index df46bbe..fe9b389 100644
--- a/qmake/quick.pri
+++ b/qmake/quick.pri
@@ -3,7 +3,9 @@ QT += \
     quicktemplates2 quicktemplates2-private \
     quickcontrols2 quickcontrols2-private
 
-QUICK_PUB_INC_DIR = $$PWD/../include/FramelessHelper/Quick
+BASE_INC_DIR = $$PWD/../include
+COMMON_INC_DIR = $$BASE_INC_DIR/FramelessHelper
+QUICK_PUB_INC_DIR = $$COMMON_INC_DIR/Quick
 QUICK_PRIV_INC_DIR = $$QUICK_PUB_INC_DIR/private
 QUICK_SRC_DIR = $$PWD/../src/quick
 
@@ -11,10 +13,14 @@ DEFINES += \
     FRAMELESSHELPER_QUICK_STATIC
 
 INCLUDEPATH += \
+    $$BASE_INC_DIR \
+    $$COMMON_INC_DIR \
     $$QUICK_PUB_INC_DIR \
     $$QUICK_PRIV_INC_DIR
 
 DEPENDPATH += \
+    $$BASE_INC_DIR \
+    $$COMMON_INC_DIR \
     $$QUICK_PUB_INC_DIR \
     $$QUICK_PRIV_INC_DIR
 
diff --git a/qmake/widgets.pri b/qmake/widgets.pri
index 0f1e999..4cbaf16 100644
--- a/qmake/widgets.pri
+++ b/qmake/widgets.pri
@@ -1,6 +1,8 @@
-QT += widgets widgets-private
+QT += widgets
 
-WIDGETS_PUB_INC_DIR = $$PWD/../include/FramelessHelper/Widgets
+BASE_INC_DIR = $$PWD/../include
+COMMON_INC_DIR = $$BASE_INC_DIR/FramelessHelper
+WIDGETS_PUB_INC_DIR = $$COMMON_INC_DIR/Widgets
 WIDGETS_PRIV_INC_DIR = $$WIDGETS_PUB_INC_DIR/private
 WIDGETS_SRC_DIR = $$PWD/../src/widgets
 
@@ -8,10 +10,14 @@ DEFINES += \
     FRAMELESSHELPER_WIDGETS_STATIC
 
 INCLUDEPATH += \
+    $$BASE_INC_DIR \
+    $$COMMON_INC_DIR \
     $$WIDGETS_PUB_INC_DIR \
     $$WIDGETS_PRIV_INC_DIR
 
 DEPENDPATH += \
+    $$BASE_INC_DIR \
+    $$COMMON_INC_DIR \
     $$WIDGETS_PUB_INC_DIR \
     $$WIDGETS_PRIV_INC_DIR