Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advan…

…ced-Docking-System
githubuser0xFFFF · Oct 31, 2020 · 44dc76b · 44dc76b
2 parents aedbaec + 04aa622
commit 44dc76b
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 1 deletion.
diff --git a/demo/demo.pro b/demo/demo.pro
@@ -34,6 +34,7 @@ RESOURCES += demo.qrc
 
 LIBS += -L$${ADS_OUT_ROOT}/lib
 
+
 # Dependency: AdvancedDockingSystem (shared)
 CONFIG(debug, debug|release){
     win32 {
@@ -50,5 +51,10 @@ else{
     LIBS += -lqtadvanceddocking
 }
 
+unix:!macx {
+    LIBS += -lxcb
+    QT += x11extras
+}
+
 INCLUDEPATH += ../src
 DEPENDPATH += ../src
diff --git a/examples/centralwidget/centralwidget.pro b/examples/centralwidget/centralwidget.pro
@@ -45,6 +45,11 @@ else{
     LIBS += -lqtadvanceddocking
 }
 
+unix:!macx {
+    LIBS += -lxcb
+    QT += x11extras
+}
+
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src
 
diff --git a/examples/deleteonclose/deleteonclose.pro b/examples/deleteonclose/deleteonclose.pro
@@ -34,6 +34,11 @@ else{
     LIBS += -lqtadvanceddocking
 }
 
+unix:!macx {
+    LIBS += -lxcb
+    QT += x11extras
+}
+
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src    
 
diff --git a/examples/sidebar/sidebar.pro b/examples/sidebar/sidebar.pro
@@ -42,6 +42,11 @@ else{
     LIBS += -lqtadvanceddocking
 }
 
+unix:!macx {
+    LIBS += -lxcb
+    QT += x11extras
+}
+
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src    
 
diff --git a/examples/simple/simple.pro b/examples/simple/simple.pro
@@ -42,6 +42,11 @@ else{
     LIBS += -lqtadvanceddocking
 }
 
+unix:!macx {
+    LIBS += -lxcb
+    QT += x11extras
+}
+
 INCLUDEPATH += ../../src
 DEPENDPATH += ../../src    
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ endif()
 target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
 if(UNIX AND NOT APPLE)
     target_link_libraries(qtadvanceddocking PUBLIC Qt5::X11Extras)
-	target_link_libraries("${MODULE}" xcb)
+	target_link_libraries(qtadvanceddocking PRIVATE xcb)
 endif()
 set_target_properties(qtadvanceddocking PROPERTIES 
     AUTOMOC ON

diff --git a/src/src.pro b/src/src.pro
@@ -73,6 +73,7 @@ unix:!macx {
 HEADERS += linux/FloatingWidgetTitleBar.h
 SOURCES += linux/FloatingWidgetTitleBar.cpp
 QT += x11extras
+LIBS += -lxcb
 }
 
 isEmpty(PREFIX){