From 3c1ddcfbf26128898dcd4028fddf6f318e5a8d69 Mon Sep 17 00:00:00 2001 From: 0xFEEDC0DE64 Date: Tue, 9 Apr 2019 18:52:32 +0200 Subject: [PATCH] Removed legacy qmake files --- 3rdparty/3rdparty.pro | 3 -- DbSoftware.pro | 32 --------------- app.pri | 4 -- installs.pri | 14 ------- installs_win32.pri | 28 -------------- lib.pri | 4 -- libs/libs.pro | 5 --- project.pri | 90 ------------------------------------------- 8 files changed, 180 deletions(-) delete mode 100644 3rdparty/3rdparty.pro delete mode 100644 DbSoftware.pro delete mode 100644 app.pri delete mode 100644 installs.pri delete mode 100644 installs_win32.pri delete mode 100644 lib.pri delete mode 100644 libs/libs.pro delete mode 100644 project.pri diff --git a/3rdparty/3rdparty.pro b/3rdparty/3rdparty.pro deleted file mode 100644 index dac92ce..0000000 --- a/3rdparty/3rdparty.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs - -exists(Quazip/Quazip.pro): SUBDIRS += Quazip diff --git a/DbSoftware.pro b/DbSoftware.pro deleted file mode 100644 index e1f7d9f..0000000 --- a/DbSoftware.pro +++ /dev/null @@ -1,32 +0,0 @@ -TEMPLATE = subdirs - -SUBDIRS += 3rdparty libs -exists(DbDatabaseTree/DbDatabaseTree.pro): SUBDIRS += DbDatabaseTree -exists(DbHashCracker/DbHashCracker.pro): SUBDIRS += DbHashCracker -exists(DbMessaging/DbMessaging.pro): SUBDIRS += DbMessaging -exists(DbNeuralNet/DbNeuralNet.pro): SUBDIRS += DbNeuralNet -exists(DbPathFinder/DbPathFinder.pro): SUBDIRS += DbPathFinder -exists(DbPicSync/DbPicSync.pro): SUBDIRS += DbPicSync -exists(DbRadioDumper/DbRadioDumper.pro): SUBDIRS += DbRadioDumper -exists(DbSerialServer/DbSerialServer.pro): { - qtHaveModule(serialport): SUBDIRS += DbSerialServer - else: message("serialport is missing, will not build DbSerialServer") -} -exists(DbSketch/DbSketch.pro): SUBDIRS += DbSketch -exists(DbTernaryClock/DbTernaryClock.pro): SUBDIRS += DbTernaryClock -exists(DbTictactoe/DbTictactoe.pro): SUBDIRS += DbTictactoe -exists(DbWebserver/DbWebserver.pro): SUBDIRS += DbWebserver -exists(DbZeiterfassung/DbZeiterfassung.pro): SUBDIRS += DbZeiterfassung - -contains(SUBDIRS, DbSerialServer): DbSerialServer.depends += libs -contains(SUBDIRS, DbSketch): DbSketch.depends += 3rdparty -contains(SUBDIRS, DbTernaryClock): DbTernaryClock.depends += libs -contains(SUBDIRS, DbWebserver): DbWebserver.depends += libs -contains(SUBDIRS, DbZeiterfassung): DbZeiterfassung.depends += 3rdparty DbSketch libs - -OTHER_FILES += app.pri \ - lib.pri \ - project.pri - -include(installs.pri) -win32: include(installs_win32.pri) diff --git a/app.pri b/app.pri deleted file mode 100644 index a94c83d..0000000 --- a/app.pri +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = app -CONFIG -= app_bundle -DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin -include(project.pri) diff --git a/installs.pri b/installs.pri deleted file mode 100644 index df38b05..0000000 --- a/installs.pri +++ /dev/null @@ -1,14 +0,0 @@ -qtTranslationsInstall.path = $${OUT_PWD}/bin/translations -qtTranslationsInstall.files = $$[QT_INSTALL_TRANSLATIONS]/qt_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_en.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qt_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtbase_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtmultimedia_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtquick1_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtscript_de.qm \ - $$[QT_INSTALL_TRANSLATIONS]/qtxmlpatterns_de.qm -INSTALLS += qtTranslationsInstall diff --git a/installs_win32.pri b/installs_win32.pri deleted file mode 100644 index da5ead8..0000000 --- a/installs_win32.pri +++ /dev/null @@ -1,28 +0,0 @@ -CONFIG(debug, release|debug): DEBUG_SIGN = d - -qtLibsInstall.path = $${OUT_PWD}/bin -qtLibsInstall.files = win32/Qt.conf \ - $$[QT_INSTALL_BINS]/Qt5Core$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/Qt5Gui$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/Qt5Network$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/Qt5Widgets$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll \ - $$[QT_INSTALL_BINS]/libstdc++-6.dll \ - $$[QT_INSTALL_BINS]/libwinpthread-1.dll -INSTALLS += qtLibsInstall - -qtImageFormatsInstall.path = $${OUT_PWD}/bin/plugins/imageformats -qtImageFormatsInstall.files = $$[QT_INSTALL_PLUGINS]/imageformats/qgif$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qicns$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qico$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qsvg$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtga$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwbmp$${DEBUG_SIGN}.dll \ - $$[QT_INSTALL_PLUGINS]/imageformats/qwebp$${DEBUG_SIGN}.dll -INSTALLS += qtImageFormatsInstall - -qtPlatformsInstall.path = $${OUT_PWD}/bin/plugins/platforms -qtPlatformsInstall.files = $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DEBUG_SIGN}.dll -INSTALLS += qtPlatformsInstall diff --git a/lib.pri b/lib.pri deleted file mode 100644 index a869ed1..0000000 --- a/lib.pri +++ /dev/null @@ -1,4 +0,0 @@ -TEMPLATE = lib -win32: DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/bin -else: DESTDIR = $${OUT_PWD}/$${PROJECT_ROOT}/lib -include(project.pri) diff --git a/libs/libs.pro b/libs/libs.pro deleted file mode 100644 index f8b96a1..0000000 --- a/libs/libs.pro +++ /dev/null @@ -1,5 +0,0 @@ -TEMPLATE = subdirs - -exists(DbCoreLib/DbCoreLib.pro): SUBDIRS += DbCoreLib -exists(DbGuiLib/DbGuiLib.pro): SUBDIRS += DbGuiLib -exists(DbNetworkLib/DbNetworkLib.pro): SUBDIRS += DbNetworkLib diff --git a/project.pri b/project.pri deleted file mode 100644 index 8582e3b..0000000 --- a/project.pri +++ /dev/null @@ -1,90 +0,0 @@ -CONFIG += qt warn_on depend_includepath c++14 - -QMAKE_TARGET_PRODUCT = "DbSoftware" -QMAKE_TARGET_DESCRIPTION = "$$TARGET" -QMAKE_TARGET_COMPANY = "brunner.ninja" -QMAKE_TARGET_COPYRIGHT = "Copyright (C) by feedc0de" - -DEFINES += QT_DEPRECATED_WARNINGS \ - QT_DISABLE_DEPRECATED_BEFORE=0x060000 \ - QT_MESSAGELOGCONTEXT - -!isEmpty(DBLIBS) { - win32: LIBS += -L$${OUT_PWD}/$${PROJECT_ROOT}/bin - else: LIBS += -Wl,-rpath=\\\$$ORIGIN/../lib -L$${OUT_PWD}/$${PROJECT_ROOT}/lib -} - -contains(DBLIBS, sketchlib): DBLIBS *= quazip -contains(DBLIBS, webserverlib): DBLIBS *= dbnetwork -contains(DBLIBS, zeiterfassunggui): DBLIBS *= dbcore - -for(DBLIB, DBLIBS) { - equals(DBLIB, dbcore) { - LIBS += -ldbcore - - INCLUDEPATH += $${PROJECT_ROOT}/libs/DbCoreLib - DEPENDPATH += $${PROJECT_ROOT}/libs/DbCoreLib - } else: equals(DBLIB, dbgui) { - LIBS += -ldbgui - - INCLUDEPATH += $${PROJECT_ROOT}/libs/DbGuiLib - DEPENDPATH += $${PROJECT_ROOT}/libs/DbGuiLib - } else: equals(DBLIB, dbnetwork) { - LIBS += -ldbnetwork - - INCLUDEPATH += $${PROJECT_ROOT}/libs/DbNetworkLib - DEPENDPATH += $${PROJECT_ROOT}/libs/DbNetworkLib - } else: equals(DBLIB, messaginglib) { - LIBS += -lmessaginglib - - INCLUDEPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib - DEPENDPATH += $${PROJECT_ROOT}/DbMessaging/messaginglib - } else: equals(DBLIB, neuralnetlib) { - LIBS += -lneuralnetlib - - INCLUDEPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib - DEPENDPATH += $${PROJECT_ROOT}/DbNeuralNet/neuralnetlib - } else: equals(DBLIB, sketchlib) { - LIBS += -lsketchlib - - INCLUDEPATH += $${PROJECT_ROOT}/DbSketch/sketchlib - DEPENDPATH += $${PROJECT_ROOT}/DbSketch/sketchlib - } else: equals(DBLIB, webserverlib) { - LIBS += -lwebserverlib - - INCLUDEPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib - DEPENDPATH += $${PROJECT_ROOT}/DbWebserver/webserverlib - } else: equals(DBLIB, zeiterfassungcore) { - LIBS += -lzeiterfassungcore - - INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib - DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungcorelib - } else: equals(DBLIB, zeiterfassungnetwork) { - LIBS += -lzeiterfassungnetwork - - INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungnetworklib - DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungnetworklib - } else: equals(DBLIB, zeiterfassunggui) { - LIBS += -lzeiterfassunggui - - INCLUDEPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib - DEPENDPATH += $${PROJECT_ROOT}/DbZeiterfassung/zeiterfassungguilib - } else: equals(DBLIB, quazip) { - LIBS += -lquazip - - INCLUDEPATH += $${PROJECT_ROOT}/3rdparty/Quazip - DEPENDPATH += $${PROJECT_ROOT}/3rdparty/Quazip - } else: message("ERROR: Unknown dblib $$DBLIB") -} - -isEmpty(QMAKE_LRELEASE) { - win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe - else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease -} - -lrelease.input = TRANSLATIONS -lrelease.output = $${OUT_PWD}/$${PROJECT_ROOT}/bin/translations/${QMAKE_FILE_BASE}.qm -lrelease.commands = $${QMAKE_LRELEASE} ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} -lrelease.CONFIG += no_link -QMAKE_EXTRA_COMPILERS += lrelease -PRE_TARGETDEPS += compiler_lrelease_make_all