mirror of
https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System.git
synced 2025-01-12 08:10:25 +08:00
Merge branch 'master' of https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System
This commit is contained in:
commit
44dc76bd19
@ -34,6 +34,7 @@ RESOURCES += demo.qrc
|
|||||||
|
|
||||||
LIBS += -L$${ADS_OUT_ROOT}/lib
|
LIBS += -L$${ADS_OUT_ROOT}/lib
|
||||||
|
|
||||||
|
|
||||||
# Dependency: AdvancedDockingSystem (shared)
|
# Dependency: AdvancedDockingSystem (shared)
|
||||||
CONFIG(debug, debug|release){
|
CONFIG(debug, debug|release){
|
||||||
win32 {
|
win32 {
|
||||||
@ -50,5 +51,10 @@ else{
|
|||||||
LIBS += -lqtadvanceddocking
|
LIBS += -lqtadvanceddocking
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unix:!macx {
|
||||||
|
LIBS += -lxcb
|
||||||
|
QT += x11extras
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDEPATH += ../src
|
INCLUDEPATH += ../src
|
||||||
DEPENDPATH += ../src
|
DEPENDPATH += ../src
|
||||||
|
@ -45,6 +45,11 @@ else{
|
|||||||
LIBS += -lqtadvanceddocking
|
LIBS += -lqtadvanceddocking
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unix:!macx {
|
||||||
|
LIBS += -lxcb
|
||||||
|
QT += x11extras
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDEPATH += ../../src
|
INCLUDEPATH += ../../src
|
||||||
DEPENDPATH += ../../src
|
DEPENDPATH += ../../src
|
||||||
|
|
||||||
|
@ -34,6 +34,11 @@ else{
|
|||||||
LIBS += -lqtadvanceddocking
|
LIBS += -lqtadvanceddocking
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unix:!macx {
|
||||||
|
LIBS += -lxcb
|
||||||
|
QT += x11extras
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDEPATH += ../../src
|
INCLUDEPATH += ../../src
|
||||||
DEPENDPATH += ../../src
|
DEPENDPATH += ../../src
|
||||||
|
|
||||||
|
@ -42,6 +42,11 @@ else{
|
|||||||
LIBS += -lqtadvanceddocking
|
LIBS += -lqtadvanceddocking
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unix:!macx {
|
||||||
|
LIBS += -lxcb
|
||||||
|
QT += x11extras
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDEPATH += ../../src
|
INCLUDEPATH += ../../src
|
||||||
DEPENDPATH += ../../src
|
DEPENDPATH += ../../src
|
||||||
|
|
||||||
|
@ -42,6 +42,11 @@ else{
|
|||||||
LIBS += -lqtadvanceddocking
|
LIBS += -lqtadvanceddocking
|
||||||
}
|
}
|
||||||
|
|
||||||
|
unix:!macx {
|
||||||
|
LIBS += -lxcb
|
||||||
|
QT += x11extras
|
||||||
|
}
|
||||||
|
|
||||||
INCLUDEPATH += ../../src
|
INCLUDEPATH += ../../src
|
||||||
DEPENDPATH += ../../src
|
DEPENDPATH += ../../src
|
||||||
|
|
||||||
|
@ -62,7 +62,7 @@ endif()
|
|||||||
target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
|
target_link_libraries(qtadvanceddocking PUBLIC Qt5::Core Qt5::Gui Qt5::Widgets)
|
||||||
if(UNIX AND NOT APPLE)
|
if(UNIX AND NOT APPLE)
|
||||||
target_link_libraries(qtadvanceddocking PUBLIC Qt5::X11Extras)
|
target_link_libraries(qtadvanceddocking PUBLIC Qt5::X11Extras)
|
||||||
target_link_libraries("${MODULE}" xcb)
|
target_link_libraries(qtadvanceddocking PRIVATE xcb)
|
||||||
endif()
|
endif()
|
||||||
set_target_properties(qtadvanceddocking PROPERTIES
|
set_target_properties(qtadvanceddocking PROPERTIES
|
||||||
AUTOMOC ON
|
AUTOMOC ON
|
||||||
|
@ -73,6 +73,7 @@ unix:!macx {
|
|||||||
HEADERS += linux/FloatingWidgetTitleBar.h
|
HEADERS += linux/FloatingWidgetTitleBar.h
|
||||||
SOURCES += linux/FloatingWidgetTitleBar.cpp
|
SOURCES += linux/FloatingWidgetTitleBar.cpp
|
||||||
QT += x11extras
|
QT += x11extras
|
||||||
|
LIBS += -lxcb
|
||||||
}
|
}
|
||||||
|
|
||||||
isEmpty(PREFIX){
|
isEmpty(PREFIX){
|
||||||
|
Loading…
Reference in New Issue
Block a user