From 637db7f4f924ba10f13922e28958be2d9cc6e000 Mon Sep 17 00:00:00 2001 From: githubuser0xFFFF Date: Tue, 27 Oct 2020 18:50:54 +0100 Subject: [PATCH 1/3] Update CMakeLists.txt --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c2d6e379..79424f20 100644 --- 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 xcb) endif() set_target_properties(qtadvanceddocking PROPERTIES AUTOMOC ON From 356422948256cc54df3e0b06cf02161cf4093f2b Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 30 Oct 2020 21:13:19 +0100 Subject: [PATCH 2/3] Fixed CMake static build --- src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79424f20..f5c5fb6b 100644 --- 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(qtadvanceddocking xcb) + target_link_libraries(qtadvanceddocking PRIVATE xcb) endif() set_target_properties(qtadvanceddocking PROPERTIES AUTOMOC ON From 04aa622111878138a16a910b78100c8fa9a44265 Mon Sep 17 00:00:00 2001 From: Uwe Date: Fri, 30 Oct 2020 21:49:28 +0100 Subject: [PATCH 3/3] Fixed static qmake build --- demo/demo.pro | 6 ++++++ examples/centralwidget/centralwidget.pro | 5 +++++ examples/deleteonclose/deleteonclose.pro | 5 +++++ examples/sidebar/sidebar.pro | 5 +++++ examples/simple/simple.pro | 5 +++++ src/src.pro | 1 + 6 files changed, 27 insertions(+) diff --git a/demo/demo.pro b/demo/demo.pro index dd5870db..24a2965b 100644 --- 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 index 3c0932da..f5bb92b0 100644 --- 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 index e2d2e69a..8e835eec 100644 --- 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 index 4d699202..659bce56 100644 --- 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 index f79c718a..cb76cea9 100644 --- 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/src.pro b/src/src.pro index db26109c..54659be4 100644 --- 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){