From e55ad49db8903b2ca1425ae6c25b275ebfca8e95 Mon Sep 17 00:00:00 2001 From: Uwe Kindler Date: Sat, 2 Jan 2021 19:48:34 +0100 Subject: [PATCH] Created ads.pri to ease linking of ads library --- demo/demo.pro | 23 ++--------------------- examples/centralwidget/centralwidget.pro | 23 +---------------------- examples/deleteonclose/deleteonclose.pro | 23 +---------------------- examples/sidebar/sidebar.pro | 23 +---------------------- examples/simple/simple.pro | 23 +---------------------- 5 files changed, 6 insertions(+), 109 deletions(-) diff --git a/demo/demo.pro b/demo/demo.pro index db33bbe..80ad866 100644 --- a/demo/demo.pro +++ b/demo/demo.pro @@ -4,6 +4,8 @@ TARGET = AdvancedDockingSystemDemo DESTDIR = $${ADS_OUT_ROOT}/lib QT += core gui widgets +include(../ads.pri) + lessThan(QT_MAJOR_VERSION, 6) { win32 { QT += axcontainer @@ -37,26 +39,5 @@ RESOURCES += demo.qrc LIBS += -L$${ADS_OUT_ROOT}/lib -# Dependency: AdvancedDockingSystem (shared) -CONFIG(debug, debug|release){ - win32 { - LIBS += -lqtadvanceddockingd - } - else:mac { - LIBS += -lqtadvanceddocking_debug - } - else { - LIBS += -lqtadvanceddocking - } -} -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 f5bb92b..738ae78 100644 --- a/examples/centralwidget/centralwidget.pro +++ b/examples/centralwidget/centralwidget.pro @@ -28,28 +28,7 @@ FORMS += \ mainwindow.ui LIBS += -L$${ADS_OUT_ROOT}/lib - -# Dependency: AdvancedDockingSystem (shared) -CONFIG(debug, debug|release){ - win32 { - LIBS += -lqtadvanceddockingd - } - else:mac { - LIBS += -lqtadvanceddocking_debug - } - else { - LIBS += -lqtadvanceddocking - } -} -else{ - LIBS += -lqtadvanceddocking -} - -unix:!macx { - LIBS += -lxcb - QT += x11extras -} - +include(../../ads.pri) INCLUDEPATH += ../../src DEPENDPATH += ../../src diff --git a/examples/deleteonclose/deleteonclose.pro b/examples/deleteonclose/deleteonclose.pro index 8e835ee..95d1db0 100644 --- a/examples/deleteonclose/deleteonclose.pro +++ b/examples/deleteonclose/deleteonclose.pro @@ -17,28 +17,7 @@ SOURCES += main.cpp LIBS += -L$${ADS_OUT_ROOT}/lib - -# Dependency: AdvancedDockingSystem (shared) -CONFIG(debug, debug|release){ - win32 { - LIBS += -lqtadvanceddockingd - } - else:mac { - LIBS += -lqtadvanceddocking_debug - } - else { - LIBS += -lqtadvanceddocking - } -} -else{ - LIBS += -lqtadvanceddocking -} - -unix:!macx { - LIBS += -lxcb - QT += x11extras -} - +include(../../ads.pri) INCLUDEPATH += ../../src DEPENDPATH += ../../src diff --git a/examples/sidebar/sidebar.pro b/examples/sidebar/sidebar.pro index 659bce5..6d7b445 100644 --- a/examples/sidebar/sidebar.pro +++ b/examples/sidebar/sidebar.pro @@ -25,28 +25,7 @@ FORMS += \ LIBS += -L$${ADS_OUT_ROOT}/lib - -# Dependency: AdvancedDockingSystem (shared) -CONFIG(debug, debug|release){ - win32 { - LIBS += -lqtadvanceddockingd - } - else:mac { - LIBS += -lqtadvanceddocking_debug - } - else { - LIBS += -lqtadvanceddocking - } -} -else{ - LIBS += -lqtadvanceddocking -} - -unix:!macx { - LIBS += -lxcb - QT += x11extras -} - +include(../../ads.pri) INCLUDEPATH += ../../src DEPENDPATH += ../../src diff --git a/examples/simple/simple.pro b/examples/simple/simple.pro index cb76cea..92a166b 100644 --- a/examples/simple/simple.pro +++ b/examples/simple/simple.pro @@ -25,28 +25,7 @@ FORMS += \ LIBS += -L$${ADS_OUT_ROOT}/lib - -# Dependency: AdvancedDockingSystem (shared) -CONFIG(debug, debug|release){ - win32 { - LIBS += -lqtadvanceddockingd - } - else:mac { - LIBS += -lqtadvanceddocking_debug - } - else { - LIBS += -lqtadvanceddocking - } -} -else{ - LIBS += -lqtadvanceddocking -} - -unix:!macx { - LIBS += -lxcb - QT += x11extras -} - +include(../../ads.pri) INCLUDEPATH += ../../src DEPENDPATH += ../../src