From 3ffb8f689bf149d9142c74efc9a709b910823ce7 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Wed, 21 Jun 2023 00:04:37 +0200 Subject: [PATCH] Remove qmake files --- .gitignore | 10 - config.tests/gl/.gitignore | 8 - config.tests/gl/gl.cpp | 17 -- config.tests/gl/gl.pro | 19 -- config.tests/glu/.gitignore | 8 - config.tests/glu/glu.cpp | 17 -- config.tests/glu/glu.pro | 19 -- config.tests/libpng/.gitignore | 8 - config.tests/libpng/libpng.cpp | 10 - config.tests/libpng/libpng.pro | 10 - config.tests/zlib/.gitignore | 8 - config.tests/zlib/zlib.cpp | 10 - config.tests/zlib/zlib.pro | 10 - install.pri | 274 ------------------ mkspecs/features/common_post.prf | 75 ----- mkspecs/features/common_pre.prf | 241 --------------- mkspecs/features/config.pri | 126 -------- mkspecs/features/config_test_pre.prf | 5 - mkspecs/features/copyfiles.pri | 47 --- mkspecs/features/externals.pri | 62 ---- mkspecs/features/libraries.pri | 88 ------ mkspecs/features/templight.pri | 28 -- mkspecs/features/templight_blacklist | 17 -- mkspecs/features/touch.prf | 9 - mkspecs/features/version.pri | 35 --- mkspecs/features/warnings.pri | 51 ---- mkspecs/features/wordsize.pri | 51 ---- resources/resources.pro | 44 --- samples/afvclient/afvclient.pro | 37 --- samples/blackmisc/sampleblackmisc.pro | 28 -- samples/blackmiscdbus/sampleblackmiscdbus.pro | 28 -- .../sampleblackmiscquantities.pro | 26 -- samples/blackmiscsim/sampleblackmiscsim.pro | 32 -- samples/cliclient/samplecliclient.pro | 26 -- samples/fsd/samplefsd.pro | 27 -- samples/hotkey/samplehotkey.pro | 33 --- samples/samples.pro | 29 -- samples/weatherdata/sampleweatherdata.pro | 26 -- src/blackconfig/blackconfig.pro | 39 --- src/blackcore/blackcore.pro | 69 ----- src/blackcore/fsd/blackfsd.pro | 22 -- src/blackcore/pch/pch.h | 40 --- src/blackgui/blackgui.pro | 118 -------- src/blackgui/pch/pch.h | 68 ----- src/blackinput/blackinput.pro | 59 ---- src/blackmisc/blackmisc.pro | 183 ------------ src/blackmisc/pch/pch.h | 121 -------- src/blacksound/blacksound.pro | 55 ---- src/plugins/plugins.pro | 12 - src/plugins/simulator/emulated/emulated.pro | 32 -- .../emulatedconfig/emulatedconfig.pro | 31 -- .../simulator/flightgear/flightgear.pro | 39 --- .../flightgearconfig/flightgearconfig.pro | 32 -- src/plugins/simulator/fs9/fs9.pro | 34 --- src/plugins/simulator/fscommon/fscommon.pro | 41 --- src/plugins/simulator/fsuipc32/fsuipc32.pro | 23 -- src/plugins/simulator/fsuipc64/fsuipc64.pro | 23 -- src/plugins/simulator/fsx/fsx.pro | 33 --- src/plugins/simulator/fsxcommon/fsxcommon.pro | 35 --- src/plugins/simulator/fsxconfig/fsxconfig.pro | 33 --- src/plugins/simulator/msfs/msfs.pro | 44 --- src/plugins/simulator/p3d/p3d.pro | 33 --- src/plugins/simulator/p3dconfig/p3dconfig.pro | 33 --- .../simulator/plugincommon/plugincommon.pro | 32 -- src/plugins/simulator/simulator.pro | 43 --- src/plugins/simulator/xplane/xplane.pro | 42 --- .../simulator/xplaneconfig/xplaneconfig.pro | 32 -- src/plugins/weatherdata/gfs/g2clib/g2clib.pri | 46 --- src/plugins/weatherdata/gfs/gfs.pro | 32 -- src/plugins/weatherdata/weatherdata.pro | 11 - src/src.pro | 44 --- src/swiftcore/swiftcore.pro | 42 --- src/swiftdata/swiftdata.pro | 43 --- src/swiftguistandard/swiftguistandard.pro | 43 --- src/swiftlauncher/swiftlauncher.pro | 44 --- src/xswiftbus/version.pri | 13 - src/xswiftbus/xswiftbus.pro | 202 ------------- swift.pro | 41 --- tests/blackcore/blackcore.pro | 9 - tests/blackcore/context/context.pro | 6 - tests/blackcore/fsd/fsd.pro | 8 - .../fsd/testfsdclient/testfsdclient.pro | 33 --- .../fsd/testfsdmessages/testfsdmessages.pro | 31 -- .../testconnectivity/testconnectivity.pro | 31 -- tests/blackcore/testreaders/testreaders.pro | 30 -- tests/blackgui/blackgui.pro | 7 - .../testguiutility/testguiutility.pro | 31 -- tests/blackmisc/aviation/aviation.pro | 9 - .../testaircraftparts/testaircraftparts.pro | 30 -- .../testaircraftsituation.pro | 30 -- .../aviation/testaviation/testaviation.pro | 30 -- .../testflightplan/testflightplan.pro | 30 -- tests/blackmisc/blackmisc.pro | 29 -- tests/blackmisc/geo/geo.pro | 6 - tests/blackmisc/geo/testgeo/testgeo.pro | 30 -- tests/blackmisc/input/input.pro | 6 - tests/blackmisc/input/testinput/testinput.pro | 30 -- tests/blackmisc/math/math.pro | 6 - tests/blackmisc/math/testmath/testmath.pro | 30 -- tests/blackmisc/pq/pq.pro | 6 - .../testphysicalquantities.pro | 30 -- tests/blackmisc/simulation/simulation.pro | 9 - .../testinterpolatorlinear.pro | 30 -- .../testinterpolatormisc.pro | 30 -- .../testinterpolatorparts.pro | 30 -- .../simulation/testxplane/testxplane.pro | 30 -- tests/blackmisc/testcompress/testcompress.pro | 30 -- .../testcontainers/testcontainers.pro | 30 -- .../testdatastream/testdatastream.pro | 30 -- tests/blackmisc/testdbus/testdbus.pro | 30 -- tests/blackmisc/testicon/testicon.pro | 30 -- .../testidentifier/testidentifier.pro | 30 -- .../testlibrarypath/testlibrarypath.pro | 30 -- tests/blackmisc/testprocess/testprocess.pro | 30 -- .../testpropertyindex/testpropertyindex.pro | 30 -- .../sharedstatetestserver.pro | 30 -- .../testsharedstate/testsharedstate.pro | 31 -- tests/blackmisc/testslot/testslot.pro | 30 -- .../teststatusmessage/teststatusmessage.pro | 30 -- .../teststringutils/teststringutils.pro | 30 -- .../testvaluecache/testvaluecache.pro | 30 -- .../testvariantandmap/testvariantandmap.pro | 30 -- tests/blackmisc/testworker/testworker.pro | 30 -- .../weather/testweather/testweather.pro | 30 -- tests/blackmisc/weather/weather.pro | 6 - .../testblacksimpluginfsxp3d.pro | 33 --- tests/tests.pro | 22 -- 127 files changed, 4780 deletions(-) delete mode 100644 config.tests/gl/.gitignore delete mode 100644 config.tests/gl/gl.cpp delete mode 100644 config.tests/gl/gl.pro delete mode 100644 config.tests/glu/.gitignore delete mode 100644 config.tests/glu/glu.cpp delete mode 100644 config.tests/glu/glu.pro delete mode 100644 config.tests/libpng/.gitignore delete mode 100644 config.tests/libpng/libpng.cpp delete mode 100644 config.tests/libpng/libpng.pro delete mode 100644 config.tests/zlib/.gitignore delete mode 100644 config.tests/zlib/zlib.cpp delete mode 100644 config.tests/zlib/zlib.pro delete mode 100644 install.pri delete mode 100644 mkspecs/features/common_post.prf delete mode 100644 mkspecs/features/common_pre.prf delete mode 100644 mkspecs/features/config.pri delete mode 100644 mkspecs/features/config_test_pre.prf delete mode 100644 mkspecs/features/copyfiles.pri delete mode 100644 mkspecs/features/externals.pri delete mode 100644 mkspecs/features/libraries.pri delete mode 100644 mkspecs/features/templight.pri delete mode 100644 mkspecs/features/templight_blacklist delete mode 100644 mkspecs/features/touch.prf delete mode 100644 mkspecs/features/version.pri delete mode 100644 mkspecs/features/warnings.pri delete mode 100644 mkspecs/features/wordsize.pri delete mode 100644 resources/resources.pro delete mode 100644 samples/afvclient/afvclient.pro delete mode 100644 samples/blackmisc/sampleblackmisc.pro delete mode 100644 samples/blackmiscdbus/sampleblackmiscdbus.pro delete mode 100644 samples/blackmiscquantities/sampleblackmiscquantities.pro delete mode 100644 samples/blackmiscsim/sampleblackmiscsim.pro delete mode 100644 samples/cliclient/samplecliclient.pro delete mode 100644 samples/fsd/samplefsd.pro delete mode 100644 samples/hotkey/samplehotkey.pro delete mode 100644 samples/samples.pro delete mode 100644 samples/weatherdata/sampleweatherdata.pro delete mode 100644 src/blackconfig/blackconfig.pro delete mode 100644 src/blackcore/blackcore.pro delete mode 100644 src/blackcore/fsd/blackfsd.pro delete mode 100644 src/blackcore/pch/pch.h delete mode 100644 src/blackgui/blackgui.pro delete mode 100644 src/blackgui/pch/pch.h delete mode 100644 src/blackinput/blackinput.pro delete mode 100644 src/blackmisc/blackmisc.pro delete mode 100644 src/blackmisc/pch/pch.h delete mode 100644 src/blacksound/blacksound.pro delete mode 100644 src/plugins/plugins.pro delete mode 100644 src/plugins/simulator/emulated/emulated.pro delete mode 100644 src/plugins/simulator/emulatedconfig/emulatedconfig.pro delete mode 100644 src/plugins/simulator/flightgear/flightgear.pro delete mode 100644 src/plugins/simulator/flightgearconfig/flightgearconfig.pro delete mode 100644 src/plugins/simulator/fs9/fs9.pro delete mode 100644 src/plugins/simulator/fscommon/fscommon.pro delete mode 100644 src/plugins/simulator/fsuipc32/fsuipc32.pro delete mode 100644 src/plugins/simulator/fsuipc64/fsuipc64.pro delete mode 100644 src/plugins/simulator/fsx/fsx.pro delete mode 100644 src/plugins/simulator/fsxcommon/fsxcommon.pro delete mode 100644 src/plugins/simulator/fsxconfig/fsxconfig.pro delete mode 100644 src/plugins/simulator/msfs/msfs.pro delete mode 100644 src/plugins/simulator/p3d/p3d.pro delete mode 100644 src/plugins/simulator/p3dconfig/p3dconfig.pro delete mode 100644 src/plugins/simulator/plugincommon/plugincommon.pro delete mode 100644 src/plugins/simulator/simulator.pro delete mode 100644 src/plugins/simulator/xplane/xplane.pro delete mode 100644 src/plugins/simulator/xplaneconfig/xplaneconfig.pro delete mode 100644 src/plugins/weatherdata/gfs/g2clib/g2clib.pri delete mode 100644 src/plugins/weatherdata/gfs/gfs.pro delete mode 100644 src/plugins/weatherdata/weatherdata.pro delete mode 100644 src/src.pro delete mode 100644 src/swiftcore/swiftcore.pro delete mode 100644 src/swiftdata/swiftdata.pro delete mode 100644 src/swiftguistandard/swiftguistandard.pro delete mode 100644 src/swiftlauncher/swiftlauncher.pro delete mode 100644 src/xswiftbus/version.pri delete mode 100644 src/xswiftbus/xswiftbus.pro delete mode 100644 swift.pro delete mode 100644 tests/blackcore/blackcore.pro delete mode 100644 tests/blackcore/context/context.pro delete mode 100644 tests/blackcore/fsd/fsd.pro delete mode 100644 tests/blackcore/fsd/testfsdclient/testfsdclient.pro delete mode 100644 tests/blackcore/fsd/testfsdmessages/testfsdmessages.pro delete mode 100644 tests/blackcore/testconnectivity/testconnectivity.pro delete mode 100644 tests/blackcore/testreaders/testreaders.pro delete mode 100644 tests/blackgui/blackgui.pro delete mode 100644 tests/blackgui/testguiutility/testguiutility.pro delete mode 100644 tests/blackmisc/aviation/aviation.pro delete mode 100644 tests/blackmisc/aviation/testaircraftparts/testaircraftparts.pro delete mode 100644 tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.pro delete mode 100644 tests/blackmisc/aviation/testaviation/testaviation.pro delete mode 100644 tests/blackmisc/aviation/testflightplan/testflightplan.pro delete mode 100644 tests/blackmisc/blackmisc.pro delete mode 100644 tests/blackmisc/geo/geo.pro delete mode 100644 tests/blackmisc/geo/testgeo/testgeo.pro delete mode 100644 tests/blackmisc/input/input.pro delete mode 100644 tests/blackmisc/input/testinput/testinput.pro delete mode 100644 tests/blackmisc/math/math.pro delete mode 100644 tests/blackmisc/math/testmath/testmath.pro delete mode 100644 tests/blackmisc/pq/pq.pro delete mode 100644 tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.pro delete mode 100644 tests/blackmisc/simulation/simulation.pro delete mode 100644 tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.pro delete mode 100644 tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.pro delete mode 100644 tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.pro delete mode 100644 tests/blackmisc/simulation/testxplane/testxplane.pro delete mode 100644 tests/blackmisc/testcompress/testcompress.pro delete mode 100644 tests/blackmisc/testcontainers/testcontainers.pro delete mode 100644 tests/blackmisc/testdatastream/testdatastream.pro delete mode 100644 tests/blackmisc/testdbus/testdbus.pro delete mode 100644 tests/blackmisc/testicon/testicon.pro delete mode 100644 tests/blackmisc/testidentifier/testidentifier.pro delete mode 100644 tests/blackmisc/testlibrarypath/testlibrarypath.pro delete mode 100644 tests/blackmisc/testprocess/testprocess.pro delete mode 100644 tests/blackmisc/testpropertyindex/testpropertyindex.pro delete mode 100644 tests/blackmisc/testsharedstate/sharedstatetestserver/sharedstatetestserver.pro delete mode 100644 tests/blackmisc/testsharedstate/testsharedstate.pro delete mode 100644 tests/blackmisc/testslot/testslot.pro delete mode 100644 tests/blackmisc/teststatusmessage/teststatusmessage.pro delete mode 100644 tests/blackmisc/teststringutils/teststringutils.pro delete mode 100644 tests/blackmisc/testvaluecache/testvaluecache.pro delete mode 100644 tests/blackmisc/testvariantandmap/testvariantandmap.pro delete mode 100644 tests/blackmisc/testworker/testworker.pro delete mode 100644 tests/blackmisc/weather/testweather/testweather.pro delete mode 100644 tests/blackmisc/weather/weather.pro delete mode 100644 tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.pro delete mode 100644 tests/tests.pro diff --git a/.gitignore b/.gitignore index 7872f683f..385440687 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,6 @@ # SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors # SPDX-License-Identifier: CC0-1.0 -# MSVC generated precompiled sources -pch.h.cpp - # QtCreator project files /swift.pro.user /swift.pro.user.* @@ -31,10 +28,6 @@ desktop.ini # Editors temporary files *~ -# qmake -/.qmake.stash -/.qmake.cache - # Generated installers /swiftinstaller-*.run /swiftinstaller-*.exe @@ -49,9 +42,6 @@ desktop.ini # VATSIM key /vatsim.json -# other -/swift_config.cookie - # Jetbrains stuff .idea/** cmake-build-*/ diff --git a/config.tests/gl/.gitignore b/config.tests/gl/.gitignore deleted file mode 100644 index 649173cb2..000000000 --- a/config.tests/gl/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -Makefile -gl.obj -gl.o -gl.exe -gl diff --git a/config.tests/gl/gl.cpp b/config.tests/gl/gl.cpp deleted file mode 100644 index fccf6d36b..000000000 --- a/config.tests/gl/gl.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#if defined(Q_OS_WIN) - #include - #include -#elif defined(Q_OS_MAC) - #include -#else - #include -#endif - -int main(int, char **) -{ - glGetString(GL_VERSION); - return 0; -} diff --git a/config.tests/gl/gl.pro b/config.tests/gl/gl.pro deleted file mode 100644 index 6c2fd8272..000000000 --- a/config.tests/gl/gl.pro +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(config_test_pre) - -CONFIG -= qt -CONFIG += console - -SOURCES = gl.cpp - -win32 { - DEFINES += Q_OS_WIN - LIBS *= -lopengl32 -} -linux: LIBS *= -lGL -macx { - DEFINES += Q_OS_MAC - LIBS += -framework OpenGL -} diff --git a/config.tests/glu/.gitignore b/config.tests/glu/.gitignore deleted file mode 100644 index f03009ebc..000000000 --- a/config.tests/glu/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -Makefile -glu.obj -glu.o -glu.exe -glu diff --git a/config.tests/glu/glu.cpp b/config.tests/glu/glu.cpp deleted file mode 100644 index 81bc4bdb6..000000000 --- a/config.tests/glu/glu.cpp +++ /dev/null @@ -1,17 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#if defined(Q_OS_WIN) - #include - #include -#elif defined(Q_OS_MAC) - #include -#else - #include -#endif - -int main(int, char **) -{ - gluGetString(GL_VERSION); - return 0; -} diff --git a/config.tests/glu/glu.pro b/config.tests/glu/glu.pro deleted file mode 100644 index e1824010d..000000000 --- a/config.tests/glu/glu.pro +++ /dev/null @@ -1,19 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(config_test_pre) - -CONFIG -= qt -CONFIG += console - -SOURCES = glu.cpp - -win32 { - DEFINES += Q_OS_WIN - LIBS *= -lglu32 -} -linux: LIBS *= -lGLU -macx { - DEFINES += Q_OS_MAC - LIBS += -framework OpenGL -} diff --git a/config.tests/libpng/.gitignore b/config.tests/libpng/.gitignore deleted file mode 100644 index 0795712c0..000000000 --- a/config.tests/libpng/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -Makefile -libpng.obj -libpng.o -libpng.exe -libpng diff --git a/config.tests/libpng/libpng.cpp b/config.tests/libpng/libpng.cpp deleted file mode 100644 index a85cbce65..000000000 --- a/config.tests/libpng/libpng.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#include - -int main(int, char **) -{ - png_access_version_number(); - return 0; -} diff --git a/config.tests/libpng/libpng.pro b/config.tests/libpng/libpng.pro deleted file mode 100644 index 71a30dfdf..000000000 --- a/config.tests/libpng/libpng.pro +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(config_test_pre) - -CONFIG -= qt -CONFIG += console - -SOURCES = libpng.cpp -LIBS *= -lpng -lz diff --git a/config.tests/zlib/.gitignore b/config.tests/zlib/.gitignore deleted file mode 100644 index 2ef038194..000000000 --- a/config.tests/zlib/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -Makefile -zlib.obj -zlib.o -zlib.exe -zlib diff --git a/config.tests/zlib/zlib.cpp b/config.tests/zlib/zlib.cpp deleted file mode 100644 index 8fe88c9bc..000000000 --- a/config.tests/zlib/zlib.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -#include - -int main(int, char **) -{ - zlibVersion(); - return 0; -} diff --git a/config.tests/zlib/zlib.pro b/config.tests/zlib/zlib.pro deleted file mode 100644 index 986314991..000000000 --- a/config.tests/zlib/zlib.pro +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(config_test_pre) - -CONFIG -= qt -CONFIG += console - -SOURCES = zlib.cpp -LIBS *= -lz diff --git a/install.pri b/install.pri deleted file mode 100644 index a686117ed..000000000 --- a/install.pri +++ /dev/null @@ -1,274 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -############### Readme, License etc. ##### - -text_files_target.path = $${PREFIX}/bin -text_files_target.files *= README.md -text_files_target.files *= LICENSES/LicenseRef-swift-pilot-client-1.txt -text_files_target.files *= LICENSES/LicenseRef-swift-pilot-client-1.html - -INSTALLS += text_files_target - -############### Install Qt5 ############## - -win32 { - QT5_LIBRARIES *= Qt5Core$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5DBus$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Gui$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Multimedia$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Network$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5OpenGL$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Qml$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Svg$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Widgets$${DLL_DEBUG_SUFFIX}.dll - QT5_LIBRARIES *= Qt5Xml$${DLL_DEBUG_SUFFIX}.dll - - qt5_target.path = $${PREFIX}/bin - QT5_LIBRARY_DIR = $$[QT_INSTALL_BINS] -} -else:macx { - # MacOS workaround using rsync. Otherwise all headers are also copied. - qt5_target.path = $${PREFIX}/lib/QtCore.framework - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtConcurrent.framework/ $${PREFIX}/lib/QtConcurrent.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtCore.framework/ $${PREFIX}/lib/QtCore.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtDBus.framework/ $${PREFIX}/lib/QtDBus.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtGui.framework/ $${PREFIX}/lib/QtGui.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtMultimedia.framework/ $${PREFIX}/lib/QtMultimedia.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtNetwork.framework/ $${PREFIX}/lib/QtNetwork.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtOpenGL.framework/ $${PREFIX}/lib/QtOpenGL.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtQml.framework/ $${PREFIX}/lib/QtQml.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtPrintSupport.framework/ $${PREFIX}/lib/QtPrintSupport.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtSvg.framework/ $${PREFIX}/lib/QtSvg.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtWidgets.framework/ $${PREFIX}/lib/QtWidgets.framework/ && - qt5_target.extra += rsync -avzl --exclude \'Headers*\' --exclude \'*debug*\' $$[QT_INSTALL_LIBS]/QtXml.framework/ $${PREFIX}/lib/QtXml.framework/ -} -else:unix: { - QT5_LIBRARIES *= libQt5Core.so.5 - QT5_LIBRARIES *= libQt5DBus.so.5 - QT5_LIBRARIES *= libQt5Gui.so.5 - QT5_LIBRARIES *= libQt5Multimedia.so.5 - QT5_LIBRARIES *= libQt5MultimediaWidgets.so.5 - QT5_LIBRARIES *= libQt5Network.so.5 - QT5_LIBRARIES *= libQt5OpenGL.so.5 - QT5_LIBRARIES *= libQt5Qml.so.5 - QT5_LIBRARIES *= libQt5Svg.so.5 - QT5_LIBRARIES *= libQt5Widgets.so.5 - QT5_LIBRARIES *= libQt5XcbQpa.so.5 - QT5_LIBRARIES *= libQt5Xml.so.5 - QT5_LIBRARIES *= libQt5MultimediaGstTools.so.5 - - ICU_LIBRARIES *= libicui18n.so.56 - ICU_LIBRARIES *= libicuuc.so.56 - ICU_LIBRARIES *= libicudata.so.56 - - qt5_target.path = $${PREFIX}/lib - QT5_LIBRARY_DIR = $$[QT_INSTALL_LIBS] -} - -for (LIBRARY, QT5_LIBRARIES) { - LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY} - !exists($$LIBRARY_PATH): error("Cannot find $${LIBRARY_PATH}") - qt5_target.files *= $${LIBRARY_PATH} -} - - -for (LIBRARY, ICU_LIBRARIES) { - LIBRARY_PATH = $${QT5_LIBRARY_DIR}/$${LIBRARY} - exists($$LIBRARY_PATH): qt5_target.files *= $${LIBRARY_PATH} -} - -INSTALLS += qt5_target - -############### Install Qt5 audio plugins ############## - -win32: qt5_audio_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/audio/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_audio_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/audio/*.dylib -else:unix:qt5_audio_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/audio/*.so -qt5_audio_plugins_target.path = $${PREFIX}/bin/audio -INSTALLS += qt5_audio_plugins_target - -############### Install Qt5 bearer plugins ############## - -win32: qt5_bearer_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/bearer/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_bearer_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/bearer/*.dylib -else:unix:qt5_bearer_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/bearer/*.so -qt5_bearer_plugins_target.path = $${PREFIX}/bin/bearer -INSTALLS += qt5_bearer_plugins_target - -############### Install Qt5 iconengines plugins ############## - -win32: qt5_iconengines_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/iconengines/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_iconengines_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/iconengines/*.dylib -else:unix:qt5_iconengines_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/iconengines/*.so -qt5_iconengines_plugins_target.path = $${PREFIX}/bin/iconengines -INSTALLS += qt5_iconengines_plugins_target - -############### Install Qt5 imageformats plugins ############## - -win32: qt5_imageformats_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/imageformats/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_imageformats_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/imageformats/*.dylib -else:unix:qt5_imageformats_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/imageformats/*.so -qt5_imageformats_plugins_target.path = $${PREFIX}/bin/imageformats -INSTALLS += qt5_imageformats_plugins_target - -############### Install Qt5 mediaservice plugins ############## - -win32: qt5_mediaservice_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/mediaservice/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_mediaservice_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/mediaservice/*.dylib -else:unix:qt5_mediaservice_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/mediaservice/*.so -qt5_mediaservice_plugins_target.path = $${PREFIX}/bin/mediaservice -INSTALLS += qt5_mediaservice_plugins_target - -############### Install Qt5 platforms plugins ############## - -win32: qt5_platforms_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platforms/qwindows$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_platforms_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platforms/libqcocoa.dylib -else:unix:qt5_platforms_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platforms/libqxcb.so -qt5_platforms_plugins_target.path = $${PREFIX}/bin/platforms -INSTALLS += qt5_platforms_plugins_target - -############### Install Qt5 platforminputcontexts plugins ############## - -win32: qt5_platforminputcontexts_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platforminputcontexts/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_platforminputcontexts_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platforminputcontexts/*.dylib -else:unix:qt5_platforminputcontexts_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platforminputcontexts/*.so -qt5_platforminputcontexts_plugins_target.path = $${PREFIX}/bin/platforminputcontexts -INSTALLS += qt5_platforminputcontexts_plugins_target - -############### Install Qt5 platformthemes plugins ############## - -win32: qt5_platformthemes_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platformthemes/*$${DLL_DEBUG_SUFFIX}.dll -else:macx: qt5_platformthemes_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platformthemes/*.dylib -else:unix:qt5_platformthemes_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/platformthemes/*.so -qt5_platformthemes_plugins_target.path = $${PREFIX}/bin/platformthemes -INSTALLS += qt5_platformthemes_plugins_target - -############### Install Qt5 xcbglintegrations plugins ############## - -unix:!macx { - qt5_xcbglintegrations_plugins_target.files *= $$[QT_INSTALL_PLUGINS]/xcbglintegrations/*.so - qt5_xcbglintegrations_plugins_target.path = $${PREFIX}/bin/xcbglintegrations - INSTALLS += qt5_xcbglintegrations_plugins_target -} - -############### Install VC runtime ############## - -win32-msvc { - # https://github.com/Microsoft/vswhere/wiki - VS_WHERE = $$system_quote($$system_path($$getenv(programfiles(x86))/Microsoft Visual Studio/Installer/vswhere.exe)) - VC_REDIST_COMPONENT = Microsoft.VisualStudio.Component.VC.Redist.14.Latest - VS_PATH = $$system($$VS_WHERE -latest -products * -requires $$VC_REDIST_COMPONENT -property installationPath) - VC_REDIST_VERSION = $$cat($$VS_PATH/VC/Auxiliary/Build/Microsoft.VCRedistVersion.default.txt) - VC_REDIST_PATH = $$VS_PATH/VC/Redist/MSVC/$$VC_REDIST_VERSION - - equals(WORD_SIZE,64) { - vc_redist_target.files *= $$shell_path($$VC_REDIST_PATH/vcredist_x64.exe) - } - equals(WORD_SIZE,32) { - vc_redist_target.files *= $$shell_path($$VC_REDIST_PATH/vcredist_x86.exe) - } - vc_redist_target.path *= $${PREFIX}/vcredist - INSTALLS += vc_redist_target -} - -win32-g++ { - equals(WORD_SIZE,32) { - VC_RUNTIME_LIBS *= libgcc_s_dw2-1 - } - equals(WORD_SIZE,64) { - VC_RUNTIME_LIBS *= libgcc_s_seh-1 - } - VC_RUNTIME_LIBS *= libwinpthread-1 - VC_RUNTIME_LIBS *= libstdc++-6 - - vc_runtime_target.path *= $${PREFIX}/bin - - for (LIBRARY, VC_RUNTIME_LIBS) { - vc_runtime_target.files *= $$[QT_INSTALL_BINS]/$${LIBRARY}.$${QMAKE_EXTENSION_SHLIB} - } - - INSTALLS += vc_runtime_target -} - -############### Install csl2xsb ############### - -win32:swiftConfig(sims.xswiftbus) { - PYINST_BIN = $$system($$(SYSTEMROOT)\system32\where pyinstaller 2> nul) - !isEmpty(PYINST_BIN) { - CSL2XSB = $$shell_path($$SourceRoot/scripts/csl2xsb/CSL2XSB.py) - csl2xsb.path = $${PREFIX}/share/CSL2XSB - csl2xsb.extra = $$PYINST_BIN -y --distpath $$shell_path($${PREFIX}/share) --workpath $$shell_path($$(TEMP)) $$CSL2XSB - INSTALLS += csl2xsb - } -} - -############### Install externals ############## - -win32: externals_lib_target.path = $${PREFIX}/bin -else: externals_lib_target.path = $${PREFIX}/lib -externals_lib_target.files *= $${EXTERNALS_LIB_DIR}/*.$${QMAKE_EXTENSION_SHLIB}* -macx: externals_lib_target.files *= $${EXTERNALS_LIB_DIR}/qwt.framework -INSTALLS += externals_lib_target - -win32: externals_bin_target.path = $${PREFIX}/bin -else: externals_bin_target.path = $${PREFIX}/bin -externals_bin_target.files *= $${EXTERNALS_BIN_DIR}/* -INSTALLS += externals_bin_target - -############### Installbuilder ############## - -bitrock_builder_bin = $$(BITROCK_BUILDER) -!isEmpty(bitrock_builder_bin) { - - copy_installer_project.depends = install - win32: copy_installer_project.commands = xcopy /Y /E /I $$shell_path($$SourceRoot/installer) $$shell_path($$DestRoot/../../installer) - else: copy_installer_project.commands = cp -R $$shell_path($$SourceRoot/installer) $$shell_path($$DestRoot/../../) - QMAKE_EXTRA_TARGETS += copy_installer_project - - bitrock_project = $${PREFIX}/../installer/installbuilder/project.xml - - create_installer.depends = copy_installer_project - WINDOWS64BITMODE = 0 - win32 { - INSTALLER_PLATFORM = windows - INSTALLER_BASENAME = swiftinstaller-windows-$${WORD_SIZE}-$$swiftConfig(version.full) - INSTALLER_EXT = exe - ARCHITECTURE = 32 - equals(WORD_SIZE,64) { - WINDOWS64BITMODE = 1 - ARCHITECTURE = 64 - } - } - else:macx { - INSTALLER_PLATFORM = osx - INSTALLER_BASENAME = swiftinstaller-macos-$${WORD_SIZE}-$$swiftConfig(version.full) - INSTALLER_EXT = app - ARCHITECTURE = 64 - } - else:unix { - INSTALLER_PLATFORM = linux-x$${WORD_SIZE} - INSTALLER_BASENAME = swiftinstaller-linux-$${WORD_SIZE}-$$swiftConfig(version.full) - INSTALLER_EXT = run - ARCHITECTURE = 64 - } - swiftConfig(devBranch): INSTALLER_DEBUG = 1 - else: INSTALLER_DEBUG = 0 - - create_installer.commands = $$shell_path($${bitrock_builder_bin}) quickbuild $${bitrock_project} $${INSTALLER_PLATFORM} \ - --verbose \ - --license $$shell_path($$(HOME)/license.xml) \ - --setvars project.outputDirectory=$$shell_path($${PREFIX}/..) \ - project.installerFilename=$${INSTALLER_BASENAME}.$${INSTALLER_EXT} \ - project.version=$$swiftConfig(version.full) \ - versionFull=$$swiftConfig(version.full).$${VER_REV} \ - project.windows64bitMode=$${WINDOWS64BITMODE} \ - project.enableDebugger=$${INSTALLER_DEBUG} \ - architecture=$${ARCHITECTURE} - QMAKE_EXTRA_TARGETS += create_installer -} - -############### Bitrock Installbuilder Files ############### - -# List them in IDE -OTHER_FILES += installer/installbuilder/*.xml diff --git a/mkspecs/features/common_post.prf b/mkspecs/features/common_post.prf deleted file mode 100644 index 3da8c14a9..000000000 --- a/mkspecs/features/common_post.prf +++ /dev/null @@ -1,75 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -################################ -# Unix rpath -################################ - -equals (TEMPLATE, lib) { - # Uncomment line below to supress the default RPATH - QMAKE_LFLAGS_RPATH = - - macx: QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/ - else:unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'\$$ORIGIN\'' -} - -equals (TEMPLATE, app) { - # Uncomment line below to supress the default RPATH - QMAKE_LFLAGS_RPATH = - - # Add rpath to externals to run tests without installing. - # DYLD_LIBRARY_PATH isn't working anymore since OS X 10.11. - unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'$$EXTERNALS_LIB_DIR\'' - - macx { - contains(CONFIG, app_bundle): QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../../../../lib/ - else: QMAKE_LFLAGS *= -Wl,-rpath,@executable_path/../lib/ - } - else:unix: QMAKE_LFLAGS *= '-Wl,-rpath,\'\$$ORIGIN/../lib\'' -} - -################################ -# Work around ignored rpath for transitive dependencies -# https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1737608/comments/4 -################################ - -linux: QMAKE_LFLAGS += -Wl,--disable-new-dtags - -################################ -# Copy data files to build dir -################################ - -include(copyfiles.pri) - -################################ -# Allow "empty" projects on MacOS -################################ - -macx:staticlib:isEmpty(SOURCES) { - QMAKE_AR = touch - QMAKE_RANLIB = touch - QMAKE_MAC_SDK.$$basename(QMAKESPEC).$${QMAKE_MAC_SDK}.QMAKE_AR = $$QMAKE_AR - QMAKE_MAC_SDK.$$basename(QMAKESPEC).$${QMAKE_MAC_SDK}.QMAKE_RANLIB = $$QMAKE_RANLIB -} - -################################ -# Precompiled header -################################ - -# only MSVC gains any build time improvement -!msvc: CONFIG -= precompile_header - -# not supported by clang_cl -clang_cl: CONFIG -= precompile_header - -################################ -# Templight (template analysis tool) -################################ - -include(templight.pri) - -################################ -# Black libs -################################ - -include(libraries.pri) diff --git a/mkspecs/features/common_pre.prf b/mkspecs/features/common_pre.prf deleted file mode 100644 index 3aaafa11b..000000000 --- a/mkspecs/features/common_pre.prf +++ /dev/null @@ -1,241 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) 2015 swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -################################ -# Destination tree -################################ - -CONFIG(debug, debug|release): DestRoot = $$DestRootDebug -else: DestRoot = $$DestRootRelease - -################################ -# Build configuration -################################ - -include(config.pri) - -################################ -# Version number -################################ - -include(version.pri) - -################################ -# QMake options -################################ - -CONFIG += qt -CONFIG += warn_on -CONFIG += c++17 - -################################ -# Detect 32 or 64 bit -################################ - -include(wordsize.pri) - -################################ -# Multithreaded build in VS IDE -################################ - -contains(TEMPLATE, "vc.*"): QMAKE_CXXFLAGS *= /MP - -################################ -# Release build with debug info -################################ - -swiftConfig(releaseWithDebugInfo):swiftConfig(profileRelease) { - error(releaseWithDebugInfo and profileRelease can not be enabled together,\ - as they require different PDB formats.) -} -swiftConfig(releaseWithDebugInfo) { - msvc { - QMAKE_CXXFLAGS_RELEASE *= /Z7 - QMAKE_LFLAGS_RELEASE *= /DEBUG /INCREMENTAL:NO /OPT:REF /OPT:ICF - } - unix { - CONFIG += force_debug_info - CONFIG += separate_debug_info - llvm: QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -gline-tables-only - else: QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += -g1 -gz - } -} -swiftConfig(profileRelease) { - msvc { - QMAKE_CXXFLAGS_RELEASE *= /Zi - QMAKE_LFLAGS_RELEASE *= /DEBUG /PROFILE /INCREMENTAL:NO /OPT:REF /OPT:ICF - } -} - -################################ -# Workaround C1128 error -################################ - -msvc:!llvm: QMAKE_CXXFLAGS *= /bigobj - -################################ -# Force UTF-8 source code in MSVC -################################ - -msvc: QMAKE_CXXFLAGS *= /utf-8 -# msvc: QMAKE_CXXFLAGS *= /source-charset:utf-8 -# /utf-8 sets both the source charset and execution charset to UTF-8 - -################################ -# No gigantic MinGW obj files -################################ - -# To reduce the size of MinGW binaries, uncomment the first and comment the second line -win32-g++: CONFIG += optimize_debug -# win32-g++: QMAKE_CXXFLAGS *= -Wa,-mbig-obj - -################################ -# MinGW: Separate debug info into separate .debug files -################################ - -win32-g++: CONFIG += separate_debug_info - -################################ -# FSX or FS9 on 32bit Windows only -################################ - -!win32: disableSwiftConfig(sims.p3d, sims.msfs) -equals(WORD_SIZE,64)|!win32: disableSwiftConfig(sims.fsx, sims.fs9) -# equals(WORD_SIZE,64):win32-g++: disableSwiftConfig(sims.p3d) - -################################ -# xswiftbus on 64bit only -################################ -equals(WORD_SIZE,32): disableSwiftConfig(sims.xswiftbus) - -################################ -# For BlackMisc::getStackTrace -################################ - -linux-g++: QMAKE_LFLAGS_DEBUG *= -rdynamic - -################################ -# Handle addresses larger than 2GB -################################ - -equals(WORD_SIZE,32) { - win32-g++: QMAKE_LFLAGS *= -Wl,--large-address-aware -} - -################################ -# Support different clang drivers -################################ - -defineReplace(clangArg) { - clang_cl: return(/clang:$$1) - else: return($$1) -} - -################################ -# Externals -################################ - -include(externals.pri) - -################################ -# Enable useful warnings, disable stupid ones -################################ - -include(warnings.pri) - -################################ -# Includes -################################ - -INCLUDEPATH *= $$BuildRoot/src - -################################ -# Platform extensions -################################ - -isEmpty(QMAKE_EXTENSION_SHLIB) { - mac|ios: QMAKE_EXTENSION_SHLIB = dylib - else:win*: QMAKE_EXTENSION_SHLIB = dll - else: QMAKE_EXTENSION_SHLIB = so -} - -isEmpty(QMAKE_EXTENSION_EXE) { - win32: QMAKE_EXTENSION_EXE = exe -} - -################################ -# Install prefix -################################ - -isEmpty(PREFIX) { - PREFIX = $$BuildRoot/dist -} - -################################ -# Debug Suffix -################################ - -msvc: CONFIG(debug, debug|release): DLL_DEBUG_SUFFIX = d - -################################ -# Inter-project dependencies -################################ -defineTest(addStaticLibraryDependency) { - win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib - else: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a - export(PRE_TARGETDEPS) -} -defineTest(addLibraryDependency) { - swiftConfig(static) { - addStaticLibraryDependency($$1) - } - else { - win32:msvc: PRE_TARGETDEPS += $$DestRoot/lib/$${1}.lib - win32:gcc: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.a - linux-g++*: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.so - macx-clang: PRE_TARGETDEPS += $$DestRoot/lib/lib$${1}.dylib - export(PRE_TARGETDEPS) - } -} - -################################ -# ISO C++ conformance mode for MSVC -################################ - -msvc:greaterThan(QMAKE_MSC_VER, 1923): QMAKE_CXXFLAGS *= /permissive- -msvc:greaterThan(QMAKE_MSC_VER, 1928):!llvm: QMAKE_CXXFLAGS *= /Zc:lambda -msvc:contains(QMAKE_CXXFLAGS, /permissive-): QMAKE_CXXFLAGS *= /FI$${SourceRoot}\src\permissiveworkarounds.h - -################################ -# Experimental support for Clang on Windows -################################ - -win32:llvm { - mingw { - equals(WORD_SIZE,32): QMAKE_CXXFLAGS += --target=i686-pc-windows-gnu - equals(WORD_SIZE,64): QMAKE_CXXFLAGS += --target=x86_64-pc-windows-gnu - } - else { - QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-declarations - } - - # Address Sanitizer - # https://stackoverflow.com/a/48585886/1639256 - # http://lists.llvm.org/pipermail/cfe-dev/2016-April/048288.html - contains(QMAKE_CXXFLAGS, -fsanitize=address) { - SANITIZER_LIB_DIR = $$system(clang -print-resource-dir)\lib\windows - equals(WORD_SIZE,32): SANITIZER_LIB_SUFFIX = i386.lib - equals(WORD_SIZE,64): SANITIZER_LIB_SUFFIX = x86_64.lib - LIBS += $$SANITIZER_LIB_DIR\clang_rt.asan_dynamic-$$SANITIZER_LIB_SUFFIX - QMAKE_LFLAGS += -wholearchive:$$SANITIZER_LIB_DIR\clang_rt.asan_dynamic_runtime_thunk-$$SANITIZER_LIB_SUFFIX - QMAKE_LFLAGS += -include:__asan_seh_interceptor - } - - # Suppress warnings in Qt headers - QMAKE_RUN_CC = $(CC) -c $(CFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$obj $src - QMAKE_RUN_CC_IMP = $(CC) -c $(CFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$@ $< - QMAKE_RUN_CC_IMP_BATCH = $(CC) -c $(CFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$@ @<< - QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$obj $src - QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$@ $< - QMAKE_RUN_CXX_IMP_BATCH = $(CXX) -c $(CXXFLAGS) $(INCPATH:-I$$system_path($$[QT_HOST_PREFIX])=/imsvc $$system_path($$[QT_HOST_PREFIX])) -Fo$@ @<< -} diff --git a/mkspecs/features/config.pri b/mkspecs/features/config.pri deleted file mode 100644 index 9b3e3ef00..000000000 --- a/mkspecs/features/config.pri +++ /dev/null @@ -1,126 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -# Make sure _QMAKE_CACHE_ is initialized (otherwise config.log goes to the root directory) -cache() - -################################ -# Parse json config files -################################ - -# Copy json keys/values from one variable prefix to another, optionally caching the result -defineTest(copyJsonFromTo) { - from = $$1 - to = $$2 - options = $$3 - - for(key, $${from}._KEYS_) { - $${to}._KEYS_ *= $$key - export($${to}._KEYS_) - copyJsonFromTo($${from}.$$key, $${to}.$$key, $$options) - } - contains(options, cache):defined($${from}._KEYS_, var): cache($${to}._KEYS_) - - defined($$from, var) { - contains(options, overwrite)|!defined($$to, var) { - eval(newValue = \$\${$$from}) - $$to = $$newValue - export($$to) - } - contains(options, cache):defined($$to, var): cache($$to) - } -} - -# Options that control how the config works -!swiftNoDefaultJson: SWIFT_CONFIG_JSON = default.json $$SWIFT_CONFIG_JSON -equals(_PRO_FILE_PWD_, $$SourceRoot): CONFIG *= swiftNoCacheConfig - -# Parse the json files (or get the values from the cache) -for(jsonFile, SWIFT_CONFIG_JSON) { - contains(jsonFile, [^A-Za-z0-9_\\.]): error(Illegal character in filename \"$$jsonFile\") - jsonPath = $$SourceRoot/$$jsonFile - !exists($$jsonPath): error($$jsonPath not found) - SWIFT_CONFIG_JSON_PATHS += $$jsonPath - SWIFT_CONFIG_JSON_SHELL_PATHS += $$shell_path($$jsonPath) - export(SWIFT_CONFIG_JSON_PATHS) - export(SWIFT_CONFIG_JSON_SHELL_PATHS) - swiftNoCacheConfig { - message(Parsing $${jsonFile}...) - jsonBlob = $$cat($$jsonPath, blob) - parseJson(jsonBlob, SWIFT_CONFIG_PARSED.$$jsonFile) - copyJsonFromTo(SWIFT_CONFIG_PARSED.$$jsonFile, SWIFT_CONFIG_PARSED_ALL, overwrite) - } -} -swiftNoCacheConfig { - copyJsonFromTo(SWIFT_CONFIG_PARSED_ALL, SWIFT_CONFIG) - copyJsonFromTo(SWIFT_CONFIG, SWIFT_CONFIG_CACHE, cache overwrite) -} -else { - copyJsonFromTo(SWIFT_CONFIG_CACHE, SWIFT_CONFIG) -} - -# Automatically run qmake again when a json file changed -QMAKE_INTERNAL_INCLUDED_FILES *= $$SWIFT_CONFIG_JSON_PATHS - -# The line above doesn't work with Qt Creator's MSVC kit, so we report an error as a fallback -load(touch) -system($$TOUCH $$system_path($$BuildRoot/swift_config.cookie)) { - swift_config_changed.target = $$shell_path($$BuildRoot/swift_config.cookie) - swift_config_changed.depends = $$SWIFT_CONFIG_JSON_SHELL_PATHS - swift_config_changed.commands = @echo ERROR: swift config changed, please run qmake again >&2 && exit 1 - QMAKE_EXTRA_TARGETS += swift_config_changed - PRE_TARGETDEPS += $${swift_config_changed.target} -} -else:msvc:!qtc_run { - warning(Failed to create swift_config.cookie; you will need to manually run qmake again after any changes in $$join(SWIFT_CONFIG_JSON, ", ").) -} - -################################ -# Functions to read json config -################################ - -defineTest(swiftConfig) { - equals(SWIFT_CONFIG.$$1, true): return(true) - return(false) -} -defineReplace(swiftConfig) { - eval(value = \$\${SWIFT_CONFIG.$$1}) - return($$value) -} - -################################ -# Functions to modify json config -################################ - -defineTest(setSwiftConfig) { - SWIFT_CONFIG.$$1 = $$2 - export(SWIFT_CONFIG.$$1) -} -defineTest(enableSwiftConfig) { - for(arg, ARGS): setSwiftConfig($$arg, true) -} -defineTest(disableSwiftConfig) { - for(arg, ARGS): setSwiftConfig($$arg, false) -} - -################################ -# Functions for checking dependencies -################################ - -load(configure) - -defineTest(CheckMandatoryDependency) { - !qtCompileTest($${1}): error(Cannot find $${1} development package. Make sure it is installed. Inspect config.log for more information.) -} -defineTest(CheckOptionalDependency) { - qtCompileTest($${1}) -} - -################################ -# Global compiler macros -################################ - -swiftConfig(static) { DEFINES *= WITH_STATIC } -swiftConfig(assertsInRelease) { DEFINES *= QT_FORCE_ASSERTS } -msvc { DEFINES *= BLACK_USE_CRASHPAD } -macos { DEFINES *= BLACK_USE_CRASHPAD } diff --git a/mkspecs/features/config_test_pre.prf b/mkspecs/features/config_test_pre.prf deleted file mode 100644 index a8dda06b3..000000000 --- a/mkspecs/features/config_test_pre.prf +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -include(wordsize.pri) -include(externals.pri) diff --git a/mkspecs/features/copyfiles.pri b/mkspecs/features/copyfiles.pri deleted file mode 100644 index b130aafc8..000000000 --- a/mkspecs/features/copyfiles.pri +++ /dev/null @@ -1,47 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -copy_files.name = COPY -copy_files.input = COPY_FILES -copy_files.CONFIG = no_link - -copy_files.output_function = fileCopyDestination -defineReplace(fileCopyDestination) { - return($$DestRoot/$$relative_path($$1)) -} - -win32:isEmpty(MINGW_IN_SHELL) { - copy_files.commands = copy /y ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -} -else { - copy_files.commands = mkdir -p `dirname ${QMAKE_FILE_OUT}` && \ - cp ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -} - -QMAKE_EXTRA_COMPILERS += copy_files - - -# This CONFIG should be all that is needed to add a dependency to "make all" -# but some snafu with absolute vs. relative paths necessitates this workaround -# with PRE_TARGETDEPS instead. -#copy_files.CONFIG += target_predeps - -load(touch) -copy_files_cookie.depends = compiler_copy_files_make_all -copy_files_cookie.target = copy_files.cookie -win32:!mingw: copy_files_cookie.commands = $$TOUCH $** && $$TOUCH $@ -else: copy_files_cookie.commands = $$TOUCH $< && $$TOUCH $@ -QMAKE_EXTRA_TARGETS += copy_files_cookie - -!isEmpty($${copy_files.input}) { - PRE_TARGETDEPS += $${copy_files_cookie.target} -} - -# Disable the extra compiler when the .pro file is being parsed by the MSVC -# project generator to compute dependencies. This works around a bug where -# relative paths were being treated as absolute, leading to qmake creating -# empty directories in the root of the current drive. -contains(TEMPLATE, "vc.*"):!build_pass:QMAKE_EXTRA_COMPILERS -= copy_files - -# Work around QTBUG-79178 -equals(TEMPLATE, vcsubdirs):QMAKE_EXTRA_COMPILERS -= copy_files diff --git a/mkspecs/features/externals.pri b/mkspecs/features/externals.pri deleted file mode 100644 index f3687a934..000000000 --- a/mkspecs/features/externals.pri +++ /dev/null @@ -1,62 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -################################ -# Path to external dependencies -################################ - -# If you want to manually set the external path, uncomment the following line -# EXTERNALSROOT = /path/to/externals - -isEmpty(EXTERNALSROOT) { - EXTERNALSROOT = $$(SWIFT_EXTERNALS_DIR) -} - -isEmpty(EXTERNALSROOT) { - EXTERNALSROOT = $$SourceRoot/externals -} - -!exists("$$EXTERNALSROOT/common/include") { - error("Could not find externals in $${EXTERNALSROOT}. Please install them!") -} - -################################ -# Externals -################################ - -win32-clang-msvc: EXTERNALS_SPEC = win32-msvc -else:win32-clang-g++: EXTERNALS_SPEC = win32-g++ -else:linux: EXTERNALS_SPEC = linux-g++ -else: EXTERNALS_SPEC = $$basename(QMAKESPEC) - -msvc { - INCLUDEPATH *= $$EXTERNALSROOT/common/include -} -else:mingw { - QMAKE_CXXFLAGS += -isystem $$EXTERNALSROOT/common/include -} -else:macx { - INCLUDEPATH *= $$EXTERNALSROOT/common/include -} -else { - QMAKE_CXXFLAGS += -idirafter $$EXTERNALSROOT/common/include -} - -llvm { - QMAKE_CXXFLAGS_WARN_ON *= $$clangArg(-isystem$$system_path($$EXTERNALSROOT/common/include)) -} - -equals(WORD_SIZE,64) { - EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/bin - EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/lib - INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/include -} -equals(WORD_SIZE,32) { - EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/bin - EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/lib - INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/include -} - -LIBS *= -L$$EXTERNALS_LIB_DIR -macx: LIBS *= -F$$EXTERNALS_LIB_DIR -win32: LIBS *= -luser32 diff --git a/mkspecs/features/libraries.pri b/mkspecs/features/libraries.pri deleted file mode 100644 index e420d9ad0..000000000 --- a/mkspecs/features/libraries.pri +++ /dev/null @@ -1,88 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -LIBS *= -L$$DestRoot/lib - -unix:!macx { - # Set the rpath-link to find dependent shared libraries when linking - # Note: This does not add any rpath into the binaries. - LIBS += -Wl,-rpath-link,$$DestRoot/lib -Wl,-rpath-link,$$[QT_INSTALL_LIBS] -} - -simulatorfsxcommon { - addLibraryDependency(simulatorfsxcommon) - LIBS += -lsimulatorfsxcommon -} - -simulatorfscommon { - addLibraryDependency(simulatorfscommon) - LIBS += -lsimulatorfscommon -} - -simulatorplugincommon { - addLibraryDependency(simulatorplugincommon) - LIBS += -lsimulatorplugincommon -} - -fsuipc { - addStaticLibraryDependency(fsuipc) - LIBS += -lfsuipc -} - -simconnect { - DEFINES += SIMCONNECT_H_NOMANIFEST - equals(WORD_SIZE,64) { - SIMCONNECT_INCLUDE += $$EXTERNALSROOT/common/include/simconnect/P3D-v4 - DEFINES += P3D_SDK_VERSION=400 - } - equals(WORD_SIZE,32) { - SIMCONNECT_INCLUDE += $$EXTERNALSROOT/common/include/simconnect/FSX-XPack - } - INCLUDEPATH *= $$SIMCONNECT_INCLUDE - gcc:QMAKE_CXXFLAGS_WARN_ON += -isystem $$SIMCONNECT_INCLUDE - llvm:QMAKE_CXXFLAGS_WARN_ON *= $$clangArg(-isystem$$system_path($$SIMCONNECT_INCLUDE)) -} - -blackgui { - addLibraryDependency(blackgui) - LIBS *= -lblackgui -} - -blackcore { - addLibraryDependency(blackcore) - LIBS *= -lblackcore -} - -blacksound { - LIBS *= -lblacksound -} - -blackinput { - addLibraryDependency(blackinput) - LIBS *= -lblackinput - - macx { - LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit - } - - win32 { - LIBS *= -ldxguid -lole32 -ldinput8 -lUser32 - } -} - -blackmisc { - addLibraryDependency(blackmisc) - LIBS *= -lblackmisc - - win32 { - LIBS *= -lShell32 - } -} - -blackconfig { - addStaticLibraryDependency(blackconfig) - LIBS *= -lblackconfig -} - -# to include buildconfig_gen.inc -INCLUDEPATH *= $$BuildRoot/generated diff --git a/mkspecs/features/templight.pri b/mkspecs/features/templight.pri deleted file mode 100644 index ba4c555a6..000000000 --- a/mkspecs/features/templight.pri +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -swiftConfig(templight) { - CXXFLAGS_NO_TEMPLIGHT = $$QMAKE_CXXFLAGS - QMAKE_CXXFLAGS += -Xtemplight -profiler -Xtemplight -ignore-system - QMAKE_CXXFLAGS += -Xtemplight -blacklist -Xtemplight $$PWD/templight_blacklist - clang_cl { - QMAKE_CC = clang-cl - QMAKE_CXX = templight-cl - moc_predefs.commands = clang-cl $$CXXFLAGS_NO_TEMPLIGHT -E -Xclang -dM ${QMAKE_FILE_IN} 2>NUL >${QMAKE_FILE_OUT} - moc_predefs.commands += $$escape_expand(\n)$$LITERAL_HASH - } - - templight-convert.commands = templight-convert -f callgrind -i ${QMAKE_FILE_IN}.trace.pbf -o ${QMAKE_FILE_OUT} - templight-convert.CONFIG = no_link - templight-convert.input = OBJECTS - templight-convert.output = ${QMAKE_FILE_IN_PATH}/callgrind.${QMAKE_FILE_IN_BASE} - QMAKE_EXTRA_COMPILERS += templight-convert - - load(touch) - win32:!mingw: templight-convert-cookie.commands = $$TOUCH $** && $$TOUCH $@ - else: templight-convert-cookie.commands = $$TOUCH $< && $$TOUCH $@ - templight-convert-cookie.depends = compiler_templight-convert_make_all - templight-convert-cookie.target = templight-convert.cookie - QMAKE_EXTRA_TARGETS += templight-convert-cookie - !isEmpty(SOURCES): PRE_TARGETDEPS += templight-convert.cookie -} diff --git a/mkspecs/features/templight_blacklist b/mkspecs/features/templight_blacklist deleted file mode 100644 index 9786aebb7..000000000 --- a/mkspecs/features/templight_blacklist +++ /dev/null @@ -1,17 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -# -# Identifiers matching the regular expressions below -# will be omitted from templight traces. -# - -# standard library templates -identifier ^std(::|$) - -# standard library implementation templates -identifier __ -identifier ^_[A-Z] - -# assume templates starting with 'Q' are Qt templates -identifier ^[qQ] diff --git a/mkspecs/features/touch.prf b/mkspecs/features/touch.prf deleted file mode 100644 index 4287a0a38..000000000 --- a/mkspecs/features/touch.prf +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -win32:isEmpty(MINGW_IN_SHELL) { - TOUCH = copy /y nul >nul -} -else { - TOUCH = touch -} diff --git a/mkspecs/features/version.pri b/mkspecs/features/version.pri deleted file mode 100644 index f135008dd..000000000 --- a/mkspecs/features/version.pri +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -win32: GIT_BIN = $$system($$(SYSTEMROOT)\system32\where git 2> nul) -else: GIT_BIN = $$system(which git 2> /dev/null) - -# Count the number of commits since the version number was changed -defineReplace(gitRevCount) { - !exists(../../default.json): error(default.json missing) - CONFIG_LOG = $$system(git log --format=%H ../../default.json) - for(sha, CONFIG_LOG) { - jsonBlob = $$system(git show $${sha}:../../default.json) - parseJson(jsonBlob, jsonData) - v = $${jsonData.version.major}.$${jsonData.version.minor} - equals(v, $$swiftConfig(version.full)): BASE_COMMIT = $$sha - } - isEmpty(BASE_COMMIT): warning(Failed to find commit that changed version number to '$$swiftConfig(version.full)') - return($$system(git rev-list --count HEAD $$system_quote(^$$BASE_COMMIT))) -} - -setSwiftConfig(version.full, $$swiftConfig(version.major).$$swiftConfig(version.minor)) - -VER_MAJ = $$swiftConfig(version.major) -VER_MIN = $$swiftConfig(version.minor) -VERSION = $$swiftConfig(version.full) - -!qtc_run: !isEmpty(GIT_BIN) { - isEmpty(VER_REV) { - VER_REV = $$gitRevCount() - cache(VER_REV) - } - win32: VERSION = $${VERSION}.$${VER_REV} -} - -win32: CONFIG *= skip_target_version_ext diff --git a/mkspecs/features/warnings.pri b/mkspecs/features/warnings.pri deleted file mode 100644 index 138ab7da2..000000000 --- a/mkspecs/features/warnings.pri +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -msvc:DEFINES *= _SCL_SECURE_NO_WARNINGS - -# swift standard warnings -msvc:QMAKE_CXXFLAGS_WARN_ON *= /wd4351 /wd4661 -msvc:QMAKE_CXXFLAGS_WARN_ON -= -w44996 -clang_cl:QMAKE_CXXFLAGS_WARN_ON *= /W4 -Wno-unknown-pragmas -Wno-undefined-inline -Wno-self-assign-overloaded -gcc:QMAKE_CXXFLAGS_WARN_ON *= -Woverloaded-virtual -gcc:QMAKE_CXXFLAGS_USE_PRECOMPILE = -Winvalid-pch $$QMAKE_CXXFLAGS_USE_PRECOMPILE -gcc|llvm:QMAKE_CXXFLAGS_WARN_ON *= -Wzero-as-null-pointer-constant -gcc:QMAKE_CXXFLAGS_WARN_ON += -isystem $$[QT_INSTALL_HEADERS]/QtCore -llvm:QMAKE_CXXFLAGS_WARN_ON *= -Wno-system-headers -gcc:!clang:QMAKE_CXXFLAGS_WARN_ON *= -Wsuggest-override - -# elevated warnings -swiftConfig(allowNoisyWarnings) { - llvm { - QMAKE_CXXFLAGS_WARN_ON -= -Wno-self-assign-overloaded - QMAKE_CXXFLAGS_WARN_ON *= -Weverything $$clangArg(--system-header-prefix=$$[QT_INSTALL_HEADERS]) - QMAKE_CXXFLAGS_WARN_ON += -Wno-c++98-compat-pedantic -Wno-class-varargs -Wno-covered-switch-default - QMAKE_CXXFLAGS_WARN_ON += -Wno-documentation -Wno-documentation-unknown-command -Wno-double-promotion -Wno-exit-time-destructors - QMAKE_CXXFLAGS_WARN_ON += -Wno-gnu -Wno-missing-prototypes -Wno-newline-eof -Wno-padded -Wno-undefined-reinterpret-cast - QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-macros -Wno-used-but-marked-unused -Wno-weak-template-vtables - } - else:msvc { - QMAKE_CXXFLAGS_WARN_ON *= /Wall - QMAKE_CXXFLAGS_WARN_ON += /wd4640 /wd4619 /wd4350 /wd4351 /wd4946 /wd4510 /wd4820 /wd4571 /wd4625 /wd4626 /wd4127 - - DEFINES *= QT_CC_WARNINGS - QMAKE_CXXFLAGS_WARN_ON *= /wd4251 /wd4275 /wd4514 /wd4800 /wd4097 /wd4706 /wd4710 /wd4530 - } -} -else { - DEFINES *= QT_NO_DEPRECATED_WARNINGS - mingw:QMAKE_CXXFLAGS_WARN_ON += -Wno-maybe-uninitialized - llvm: QMAKE_CXXFLAGS_WARN_ON += -Wno-return-std-move -} - -# clazy - Qt-aware linter -equals(QMAKE_CXX, clazy)|equals(QMAKE_CXX, clazy-cl) { - CLAZY_WARNINGS *= level3 no-reserve-candidates qrequiredresult-candidates - CLAZY_WARNINGS *= isempty-vs-count raw-environment-function tr-non-literal - - # TODO: gradually fix issues so we can re-enable some of these warnings - CLAZY_WARNINGS *= no-qstring-allocations no-copyable-polymorphic no-function-args-by-value - CLAZY_WARNINGS *= no-inefficient-qlist-soft no-ctor-missing-parent-argument - - QMAKE_CXXFLAGS_WARN_ON += -Xclang -plugin-arg-clang-lazy -Xclang $$join(CLAZY_WARNINGS, ",") -} diff --git a/mkspecs/features/wordsize.pri b/mkspecs/features/wordsize.pri deleted file mode 100644 index fbd1271de..000000000 --- a/mkspecs/features/wordsize.pri +++ /dev/null @@ -1,51 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -msvc { - contains(QMAKE_TARGET.arch, x86_64) { - WORD_SIZE = 64 - } - else { - WORD_SIZE = 32 - } -} -win32-g++ { - WIN_FIND = $$(SYSTEMROOT)\system32\find - MINGW64 = $$system($$QMAKE_CXX -Q --help=target | $$WIN_FIND \"-m64\") - contains(MINGW64,[enabled]) { - WORD_SIZE = 64 - } - else { - WORD_SIZE = 32 - } -} -linux-g++ { - GCC64 = $$system($$QMAKE_CXX -Q --help=target | grep m64) - contains(GCC64,[enabled]) { - WORD_SIZE = 64 - } - else { - WORD_SIZE = 32 - } -} -linux-g++-32 { - WORD_SIZE = 32 -} -linux-g++-64 { - WORD_SIZE = 64 -} - -linux-clang { - # Assume 64 bit until we find out how to detect the compiler architecture - WORD_SIZE = 64 -} - -macx-clang { - # TODO - WORD_SIZE = 64 -} - -win32-clang-g++ { - # TODO - WORD_SIZE = 64 -} diff --git a/resources/resources.pro b/resources/resources.pro deleted file mode 100644 index d179a1bc1..000000000 --- a/resources/resources.pro +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = lib -CONFIG += staticlib -CONFIG -= qt - -OTHER_FILES += $$files($$PWD/share/images/flags/*.png) -OTHER_FILES += $$files($$PWD/share/images/airlines/*.png) -OTHER_FILES += $$files($$PWD/share/html/*.*) -OTHER_FILES += $$files($$PWD/share/legal/*.*) -OTHER_FILES += $$files($$PWD/share/test/*.*) -OTHER_FILES += $$files($$PWD/share/matchingscript/*.*) -OTHER_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/*.*) -OTHER_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/model/*.*) -OTHER_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/texture/*.*) -OTHER_FILES += $$files($$PWD/share/simulator/models/*.*) -OTHER_FILES += $$files($$PWD/shared/bootstrap/*.*) -OTHER_FILES += $$files($$PWD/shared/dbdata/*.*) -OTHER_FILES += $$files($$PWD/shared/updateinfo/*.*) - -COPY_FILES += $$files($$PWD/share/images/flags/*.png) -COPY_FILES += $$files($$PWD/share/images/airlines/*.png) -COPY_FILES += $$files($$PWD/share/html/*.*) -COPY_FILES += $$files($$PWD/share/legal/*.*) -COPY_FILES += $$files($$PWD/share/test/*.*) -COPY_FILES += $$files($$PWD/share/matchingscript/*.*) -COPY_FILES += $$files($$PWD/share/misc/*.*) -# COPY_FILES += $$files($$PWD/share/simulator/*.*) -COPY_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/*.*) -COPY_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/model/*.*) -COPY_FILES += $$files($$PWD/share/simulator/swiftTerrainProbe/texture/*.*) -COPY_FILES += $$files($$PWD/share/simulator/models/*.*) -COPY_FILES += $$files($$PWD/share/shared/bootstrap/*.*) -COPY_FILES += $$files($$PWD/share/shared/dbdata/*.*) -COPY_FILES += $$files($$PWD/share/shared/updateinfo/*.*) - -package_resources.path = $$PREFIX -package_resources.files += share -INSTALLS += package_resources - -load(common_post) diff --git a/samples/afvclient/afvclient.pro b/samples/afvclient/afvclient.pro deleted file mode 100644 index 1e42c711d..000000000 --- a/samples/afvclient/afvclient.pro +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += dbus network multimedia gui quick - -CONFIG += c++14 -CONFIG -= app_bundle -CONFIG += blackmisc blackcore blackconfig - -DEPENDPATH += . $$SourceRoot/src/blackmisc -INCLUDEPATH += . $$SourceRoot/src - -INCLUDEPATH += $$SourceRoot/src/blackcore/afv -INCLUDEPATH += $$SourceRoot/src/blackmisc/network - -# The following define makes your compiler emit warnings if you use -# any Qt feature that has been marked deprecated (the exact warnings -# depend on your compiler). Please consult the documentation of the -# deprecated API in order to know how to port your code away from it. -DEFINES += QT_DEPRECATED_WARNINGS - -# You can also make your code fail to compile if it uses deprecated APIs. -# In order to do so, uncomment the following line. -# You can also select to disable deprecated APIs only up to a certain version of Qt. -#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 - -HEADERS += *.h -SOURCES += *.cpp - -DEFINES += _USE_MATH_DEFINES -RESOURCES += qml/qml.qrc - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/samples/blackmisc/sampleblackmisc.pro b/samples/blackmisc/sampleblackmisc.pro deleted file mode 100644 index 9b6b3e07f..000000000 --- a/samples/blackmisc/sampleblackmisc.pro +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = sampleblackmisc -TEMPLATE = app - -CONFIG += console -CONFIG -= app_bundle -CONFIG += blackmisc blackcore blackgui blackconfig - -DEPENDPATH += . $$SourceRoot/src/blackmisc -INCLUDEPATH += . $$SourceRoot/src - -DESTDIR = $$DestRoot/bin - -HEADERS += *.h -SOURCES += *.cpp - -OTHER_FILES += - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/samples/blackmiscdbus/sampleblackmiscdbus.pro b/samples/blackmiscdbus/sampleblackmiscdbus.pro deleted file mode 100644 index ac845c440..000000000 --- a/samples/blackmiscdbus/sampleblackmiscdbus.pro +++ /dev/null @@ -1,28 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = sampleblackmiscdbus -TEMPLATE = app - -CONFIG += console -CONFIG -= app_bundle -CONFIG += blackmisc blackcore - -DEPENDPATH += . $$SourceRoot/src/blackmisc $$SourceRoot/src/blackcore -INCLUDEPATH += . $$SourceRoot/src - -DESTDIR = $$DestRoot/bin - -HEADERS += *.h -SOURCES += *.cpp - -OTHER_FILES += *.txt *.xml - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/samples/blackmiscquantities/sampleblackmiscquantities.pro b/samples/blackmiscquantities/sampleblackmiscquantities.pro deleted file mode 100644 index a8a507519..000000000 --- a/samples/blackmiscquantities/sampleblackmiscquantities.pro +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network multimedia - -TARGET = sampleblackmiscquantities -TEMPLATE = app - -CONFIG += console -CONFIG -= app_bundle -CONFIG += blackmisc blackcore - -DEPENDPATH += . $$SourceRoot/src/blackmisc -INCLUDEPATH += . $$SourceRoot/src - -DESTDIR = $$DestRoot/bin - -HEADERS += *.h -SOURCES += *.cpp - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/samples/blackmiscsim/sampleblackmiscsim.pro b/samples/blackmiscsim/sampleblackmiscsim.pro deleted file mode 100644 index 6e6feab11..000000000 --- a/samples/blackmiscsim/sampleblackmiscsim.pro +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = sampleblackmiscsim -TEMPLATE = app - -CONFIG -= app_bundle -CONFIG += console -CONFIG += blackmisc blacksim blackcore - -# actually not belonging in samples "blackmisc" -# but before we have not more tests we keep it here -win32 { CONFIG += fsuipc simulatorfscommon } - -DEPENDPATH += . ../../src/blackmisc -DEPENDPATH += . ../../src/blackcore -DEPENDPATH += . ../../src/plugins/fscommon -INCLUDEPATH += . ../../src - -DESTDIR = $$DestRoot/bin - -HEADERS += *.h -SOURCES += *.cpp - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/samples/cliclient/samplecliclient.pro b/samples/cliclient/samplecliclient.pro deleted file mode 100644 index 36c740821..000000000 --- a/samples/cliclient/samplecliclient.pro +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = samplecliclient -TEMPLATE = app - -CONFIG += console -CONFIG -= app_bundle -CONFIG += blackmisc blackcore - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp -HEADERS += *.h - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/samples/fsd/samplefsd.pro b/samples/fsd/samplefsd.pro deleted file mode 100644 index b64d3826a..000000000 --- a/samples/fsd/samplefsd.pro +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = samplefsd -TEMPLATE = app - -CONFIG += console -CONFIG += blackmisc blackcore -CONFIG -= app_bundle - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp - -LIBS *= -lvatsimauth - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/samples/hotkey/samplehotkey.pro b/samples/hotkey/samplehotkey.pro deleted file mode 100644 index ba25635c2..000000000 --- a/samples/hotkey/samplehotkey.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core gui dbus network - -greaterThan(QT_MAJOR_VERSION, 4): QT += widgets - -TARGET = samplehotkey -TEMPLATE = app - -CONFIG += blackmisc blackinput blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -HEADERS += *.h -SOURCES += *.cpp - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -macx { - # Modifies plugin path - qtconf.path = $$PREFIX/bin/samplehotkey.app/Contents/Resources - qtconf.files = qt.conf - INSTALLS += qtconf -} - -load(common_post) diff --git a/samples/samples.pro b/samples/samples.pro deleted file mode 100644 index b10efafa5..000000000 --- a/samples/samples.pro +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -# SUBDIRS += samplecliclient -SUBDIRS += sampleblackmiscquantities -SUBDIRS += sampleblackmiscdbus -SUBDIRS += sampleblackmisc -SUBDIRS += sampleblackmiscsim -SUBDIRS += samplehotkey -SUBDIRS += sampleweatherdata -SUBDIRS += samplefsd -# SUBDIRS += afvclient - -samplecliclient.file = cliclient/samplecliclient.pro -sampleblackmiscquantities.file = blackmiscquantities/sampleblackmiscquantities.pro -sampleblackmiscdbus.file = blackmiscdbus/sampleblackmiscdbus.pro -sampleblackmisc.file = blackmisc/sampleblackmisc.pro -sampleblackmiscsim.file = blackmiscsim/sampleblackmiscsim.pro -samplehotkey.file = hotkey/samplehotkey.pro -sampleweatherdata.file = weatherdata/sampleweatherdata.pro -samplefsd.file = fsd/samplefsd.pro -# afvclient.file = afvclient/afvclient.pro - -load(common_post) diff --git a/samples/weatherdata/sampleweatherdata.pro b/samples/weatherdata/sampleweatherdata.pro deleted file mode 100644 index 010db1520..000000000 --- a/samples/weatherdata/sampleweatherdata.pro +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = sampleweatherdata -TEMPLATE = app - -CONFIG += console -CONFIG += blackmisc blackcore -CONFIG -= app_bundle - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -HEADERS += *.h -SOURCES += *.cpp - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -load(common_post) diff --git a/src/blackconfig/blackconfig.pro b/src/blackconfig/blackconfig.pro deleted file mode 100644 index bba318dab..000000000 --- a/src/blackconfig/blackconfig.pro +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TARGET = blackconfig -TEMPLATE = lib -CONFIG += staticlib - -buildconfig_gen.cpp.input = buildconfig_gen.cpp.in -buildconfig_gen.cpp.output = $$BuildRoot/generated/buildconfig_gen.cpp - -buildconfig_gen.inc.input = buildconfig_gen.inc.in -buildconfig_gen.inc.output = $$BuildRoot/generated/buildconfig_gen.inc - -GENERATED_SOURCES += $$BuildRoot/generated/buildconfig_gen.cpp -GENERATED_FILES += $$BuildRoot/generated/buildconfig_gen.inc -QMAKE_SUBSTITUTES += buildconfig_gen.cpp buildconfig_gen.inc - -INCLUDEPATH += .. - -DEFINES += LOG_IN_FILE -HEADERS += *.h -SOURCES += *.cpp -DESTDIR = $$DestRoot/lib -OTHER_FILES += buildconfig_gen.cpp.in buildconfig_gen.inc.in - -win32: GIT_BIN = $$system($$(SYSTEMROOT)\system32\where git 2> nul) -else: GIT_BIN = $$system(which git 2> /dev/null) - -isEmpty(GIT_BIN) { - GIT_HEAD_SHA1="" - GIT_REV_COUNT=0 -} else { - GIT_HEAD_SHA1=$$system(git rev-parse --short HEAD) - GIT_REV_COUNT=$$VER_REV -} - -load(common_post) diff --git a/src/blackcore/blackcore.pro b/src/blackcore/blackcore.pro deleted file mode 100644 index ec2ae7da8..000000000 --- a/src/blackcore/blackcore.pro +++ /dev/null @@ -1,69 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -# GUI is required for the matrix classes -# Network for host info etc. -QT += network dbus xml multimedia qml - -TARGET = blackcore -TEMPLATE = lib -CONFIG += blackconfig blackmisc blackinput blacksound precompile_header - -swiftConfig(static) { - CONFIG += staticlib -} - -INCLUDEPATH += .. -DEPENDPATH += . .. - -PRECOMPILED_HEADER = pch/pch.h -INCLUDEPATH += pch - -DEFINES += LOG_IN_FILE BUILD_BLACKCORE_LIB - -HEADERS += *.h -HEADERS += $$files($$PWD/application/*.h) -HEADERS += $$files($$PWD/audio/*.h) -HEADERS += $$files($$PWD/context/*.h) -HEADERS += $$files($$PWD/data/*.h) -HEADERS += $$files($$PWD/db/*.h) -HEADERS += $$files($$PWD/vatsim/*.h) -HEADERS += $$files($$PWD/fsd/*.h) -HEADERS += $$files($$PWD/afv/*.h) -HEADERS += $$files($$PWD/afv/audio/*.h) -HEADERS += $$files($$PWD/afv/clients/*.h) -HEADERS += $$files($$PWD/afv/crypto/*.h) -HEADERS += $$files($$PWD/afv/connection/*.h) -HEADERS += $$files($$PWD/afv/model/*.h) - -SOURCES += *.cpp -SOURCES += $$files($$PWD/context/*.cpp) -SOURCES += $$files($$PWD/data/*.cpp) -SOURCES += $$files($$PWD/db/*.cpp) -SOURCES += $$files($$PWD/vatsim/*.cpp) -SOURCES += $$files($$PWD/fsd/*.cpp) -SOURCES += $$files($$PWD/afv/audio/*.cpp) -SOURCES += $$files($$PWD/afv/clients/*.cpp) -SOURCES += $$files($$PWD/afv/crypto/*.cpp) -SOURCES += $$files($$PWD/afv/connection/*.cpp) -SOURCES += $$files($$PWD/afv/model/*.cpp) - -LIBS *= -lvatsimauth -LIBS *= -lsodium - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -OTHER_FILES += readme.txt *.xml - -win32 { - dlltarget.path = $$PREFIX/bin - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/lib - INSTALLS += target -} - -load(common_post) diff --git a/src/blackcore/fsd/blackfsd.pro b/src/blackcore/fsd/blackfsd.pro deleted file mode 100644 index ede5f007e..000000000 --- a/src/blackcore/fsd/blackfsd.pro +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = blackfsd -TEMPLATE = lib - -CONFIG += staticlib -CONFIG += blackmisc - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -HEADERS += *.h -SOURCES += *.cpp - -DESTDIR = $$DestRoot/lib - -load(common_post) diff --git a/src/blackcore/pch/pch.h b/src/blackcore/pch/pch.h deleted file mode 100644 index 7a83b45cc..000000000 --- a/src/blackcore/pch/pch.h +++ /dev/null @@ -1,40 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -/* --------- - * ! WARNING ! - * --------------------------------------------------------------------------------- - * >>>> CHANGES IN ANY HEADERS INCLUDED HEREIN WILL TRIGGER A FULL REBUILD OF EVERYTHING! <<<< - * --------------------------------------------------------------------------------- - */ - -#ifdef BLACKCORE_PCH_H -# error "Don't #include this file" -#else -# define BLACKCORE_PCH_H - -# include "blackmisc/pch/pch.h" - -# ifdef __cplusplus - -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include - -# endif // __cplusplus -#endif // guard diff --git a/src/blackgui/blackgui.pro b/src/blackgui/blackgui.pro deleted file mode 100644 index d6534a588..000000000 --- a/src/blackgui/blackgui.pro +++ /dev/null @@ -1,118 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus gui network svg widgets multimedia - -TARGET = blackgui -TEMPLATE = lib -CONFIG += blackconfig blackmisc blackcore precompile_header - -swiftConfig(static) { - CONFIG += staticlib -} - -INCLUDEPATH += .. - -msvc { - INCLUDEPATH *= $$EXTERNALSROOT/common/include/qwt -} -else:mingw { - QMAKE_CXXFLAGS += -isystem $$EXTERNALSROOT/common/include/qwt -} -else:macx { - INCLUDEPATH *= $$EXTERNALSROOT/common/include/qwt -} -else { - QMAKE_CXXFLAGS += -idirafter $$EXTERNALSROOT/common/include/qwt -} - -llvm { - QMAKE_CXXFLAGS_WARN_ON *= $$clangArg(-isystem$$system_path($$EXTERNALSROOT/common/include/qwt)) -} - -# needed for "ShellScalingApi.h" only -# win32 { LIBS *= -lSHCore } - -DEPENDPATH += . .. - -PRECOMPILED_HEADER = pch/pch.h -INCLUDEPATH += pch - -DEFINES += LOG_IN_FILE BUILD_BLACKGUI_LIB QWT_DLL - -HEADERS += *.h -SOURCES += *.cpp -HEADERS += $$files($$PWD/models/*.h) -SOURCES += $$files($$PWD/models/*.cpp) -HEADERS += $$files($$PWD/menus/*.h) -SOURCES += $$files($$PWD/menus/*.cpp) - -HEADERS += $$files($$PWD/views/*.h) -SOURCES += $$files($$PWD/views/*.cpp) -FORMS += $$files($$PWD/views/*.ui) - -HEADERS += $$files($$PWD/components/*.h) -HEADERS += $$files($$PWD/settings/*.h) -SOURCES += $$files($$PWD/components/*.cpp) -SOURCES += $$files($$PWD/settings/*.cpp) -FORMS += $$files($$PWD/components/*.ui) - -HEADERS += $$files($$PWD/filters/*.h) -SOURCES += $$files($$PWD/filters/*.cpp) -FORMS += $$files($$PWD/filters/*.ui) - -HEADERS += $$files($$PWD/editors/*.h) -SOURCES += $$files($$PWD/editors/*.cpp) -FORMS += $$files($$PWD/editors/*.ui) - -HEADERS += $$files($$PWD/graphs/*.h) -SOURCES += $$files($$PWD/graphs/*.cpp) - -FORMS += $$files($$PWD/*.ui) - -win32 { - HEADERS += $$files($$PWD/win/*.h) - SOURCES += $$files($$PWD/win/*.cpp) -} - -win32 { - msvc { - CONFIG(debug, debug|release): LIBS *= -lqwtd - CONFIG(release, debug|release): LIBS *= -lqwt - } else { - LIBS *= -lqwt - } -} -else:macx { - macx: LIBS *= -framework qwt -} -else:unix { - LIBS *= -lqwt -} - -# RESOURCES += - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -OTHER_FILES += ./share/qss/*.qss ./share/qss/*.qss.in ./share/qss/*.css -COPY_FILES += $$files($$PWD/share/qss/*.qss) -COPY_FILES += $$files($$PWD/share/qss/*.css) - -win32 { - dlltarget.path = $$PREFIX/bin - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/lib - INSTALLS += target -} - -package_utils.path = $$PREFIX/share/qss -package_utils.files += share/qss/*.qss -package_utils.files += share/qss/*.css -package_utils.files += share/qss/*.ini -INSTALLS += package_utils - -load(common_post) diff --git a/src/blackgui/pch/pch.h b/src/blackgui/pch/pch.h deleted file mode 100644 index c01277f79..000000000 --- a/src/blackgui/pch/pch.h +++ /dev/null @@ -1,68 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -/* --------- - * ! WARNING ! - * --------------------------------------------------------------------------------- - * >>>> CHANGES IN ANY HEADERS INCLUDED HEREIN WILL TRIGGER A FULL REBUILD OF EVERYTHING! <<<< - * --------------------------------------------------------------------------------- - */ - -#ifdef BLACKGUI_PCH_H -# error "Don't #include this file" -#else -# define BLACKGUI_PCH_H - -# include "blackcore/pch/pch.h" - -# ifdef __cplusplus - -# include "blackcore/context/contextapplication.h" -# include "blackcore/context/contextaudio.h" -# include "blackcore/context/contextnetwork.h" -# include "blackcore/context/contextownaircraft.h" -# include "blackcore/context/contextsimulator.h" - -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include - -# endif // __cplusplus -#endif // guard diff --git a/src/blackinput/blackinput.pro b/src/blackinput/blackinput.pro deleted file mode 100644 index 69be91e05..000000000 --- a/src/blackinput/blackinput.pro +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus -macx: QT += widgets - -TARGET = blackinput -TEMPLATE = lib -CONFIG += blackmisc - -swiftConfig(static) { - CONFIG += staticlib -} - -INCLUDEPATH += .. -DEPENDPATH += . .. - -DEFINES += LOG_IN_FILE BUILD_BLACKINPUT_LIB - -HEADERS += *.h -SOURCES += *.cpp - -win32 { - HEADERS += $$files($$PWD/win/*.h) - SOURCES += $$files($$PWD/win/*.cpp) - - DEFINES += DIRECTINPUT_VERSION=0x0800 - - LIBS *= -ldxguid -lole32 -ldinput8 -lUser32 -} - -unix:!macx { - HEADERS += $$files($$PWD/linux/*.h) - SOURCES += $$files($$PWD/linux/*.cpp) -} - -macx { - HEADERS += $$files($$PWD/macos/*.h) - OBJECTIVE_SOURCES += $$files($$PWD/macos/*.mm) - LIBS += -framework CoreFoundation -framework ApplicationServices -framework Foundation -framework AppKit -} - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -OTHER_FILES += -RESOURCES += - -win32 { - dlltarget.path = $$PREFIX/bin - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/lib - INSTALLS += target -} - -load(common_post) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro deleted file mode 100644 index 01a6c9569..000000000 --- a/src/blackmisc/blackmisc.pro +++ /dev/null @@ -1,183 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += network dbus xml multimedia - -TARGET = blackmisc -TEMPLATE = lib -CONFIG += blackconfig precompile_header - -swiftConfig(static) { - CONFIG += staticlib -} - -INCLUDEPATH += .. -# DEPENDPATH += . .. // BlackMisc should be independent - -PRECOMPILED_HEADER = pch/pch.h -INCLUDEPATH += pch - -DEFINES += LOG_IN_FILE BUILD_BLACKMISC_LIB -RESOURCES += blackmisc.qrc - -# lupdate (from cmd, e.g. lupdate blackmisc.pro) -CODECFORTR = UTF-8 -TRANSLATIONS += translations/blackmisc_i18n_de.ts \ - translations/blackmisc_i18n_fr.ts \ - translations/blackmisc_i18n_en.ts - -HEADERS += *.h \ - $$files($$PWD/audio/*.h) \ -# $$files($$PWD/audio/settings/*.h) \ - $$files($$PWD/aviation/*.h) \ - $$files($$PWD/db/*.h) \ - $$files($$PWD/geo/*.h) \ - $$files($$PWD/input/*.h) \ - $$files($$PWD/math/*.h) \ - $$files($$PWD/mixin/*.h) \ - $$files($$PWD/network/*.h) \ - $$files($$PWD/network/data/*.h) \ - $$files($$PWD/network/settings/*.h) \ - $$files($$PWD/network/external/*.h) \ - $$files($$PWD/pq/*.h) \ - $$files($$PWD/sharedstate/*.h) \ - $$files($$PWD/sharedstate/dbus/*.h) \ - $$files($$PWD/simulation/*.h) \ - $$files($$PWD/simulation/data/*.h) \ - $$files($$PWD/simulation/settings/*.h) \ - $$files($$PWD/simulation/flightgear/*.h) \ - $$files($$PWD/simulation/fscommon/*.h) \ - $$files($$PWD/simulation/fsx/*.h) \ - $$files($$PWD/simulation/xplane/*.h) \ - $$files($$PWD/thirdparty/*.h) \ - $$files($$PWD/test/*.h) \ - $$files($$PWD/weather/*.h) \ - -SOURCES += *.cpp \ - $$files($$PWD/audio/*.cpp) \ -# $$files($$PWD/audio/settings/*.cpp) \ - $$files($$PWD/aviation/*.cpp) \ - $$files($$PWD/db/*.cpp) \ - $$files($$PWD/geo/*.cpp) \ - $$files($$PWD/input/*.cpp) \ - $$files($$PWD/math/*.cpp) \ - $$files($$PWD/mixin/*.cpp) \ - $$files($$PWD/network/*.cpp) \ - $$files($$PWD/network/settings/*.cpp) \ - $$files($$PWD/network/external/*.cpp) \ - $$files($$PWD/pq/*.cpp) \ - $$files($$PWD/sharedstate/*.cpp) \ - $$files($$PWD/sharedstate/dbus/*.cpp) \ - $$files($$PWD/simulation/*.cpp) \ - $$files($$PWD/simulation/data/*.cpp) \ - $$files($$PWD/simulation/settings/*.cpp) \ - $$files($$PWD/simulation/flightgear/*.cpp) \ - $$files($$PWD/simulation/fscommon/*.cpp) \ - $$files($$PWD/simulation/fsx/*.cpp) \ - $$files($$PWD/simulation/xplane/*.cpp) \ - $$files($$PWD/thirdparty/*.cpp) \ - $$files($$PWD/test/*.cpp) \ - $$files($$PWD/weather/*.cpp) \ - -macx { - HEADERS += $$files($$PWD/macos/microphoneaccess.h) - OBJECTIVE_SOURCES += $$files($$PWD/macos/microphoneaccess.mm) -} - -INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad -INCLUDEPATH *= $$EXTERNALSROOT/common/include/crashpad/mini_chromium - -win32 { - LIBS *= -lShell32 -lDbghelp -lversion - # Remove the one below once the Reg functions are removed again from CIdentifier - LIBS *= -lAdvapi32 -} -win32-g++ { - LIBS *= -lpsapi -} - -msvc { - CONFIG(debug, debug|release): LIBS *= -lclientd -lutild -lbased -lRpcrt4 -lAdvapi32 - CONFIG(release, debug|release): LIBS *= -lclient -lutil -lbase -lRpcrt4 -lAdvapi32 -} -macx: LIBS += -lclient -lutil -lbase -lbsm -framework AVFoundation -framework Security -framework CoreFoundation -framework ApplicationServices -framework Foundation -unix:!macx: LIBS *= -lclient -lutil -lbase - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -OTHER_FILES += $$TRANSLATIONS readme.txt share/dbus-1/session.conf.in - -win32 { - DBUS_SESSION_BUS_LISTEN_ADDRESS = "autolaunch:" - DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL = "" -} - -macx { - DBUS_SESSION_BUS_LISTEN_ADDRESS = "launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET" - DBUS_SESSION_CONF_MAYBE_AUTH_EXTERNAL = "EXTERNAL" -} - -win32|macx { - dbus_session_conf.input = share/dbus-1/session.conf.in - dbus_session_conf.output = $$DestRoot/share/dbus-1/session.conf - QMAKE_SUBSTITUTES += dbus_session_conf -} - -# Copy externals to build directory - -win32 { - !isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += && - # Kill all dbus sessions before trying to copy. Otherwise copy fails if the executable is in use - QMAKE_POST_LINK += taskkill /f /fi \"Imagename eq dbus-daemon.exe\" > nul - - copy_command = xcopy /Y - source_path = $$EXTERNALS_BIN_DIR/*.exe - dest_path = $$DestRoot/bin -} -else:macx { - copy_command = rsync -avzl - source_path = $$EXTERNALS_BIN_DIR/* - dest_path = $$DestRoot/bin -} -else:unix { - copy_command = cp - source_path = $$EXTERNALS_BIN_DIR/* - dest_path = $$DestRoot/bin -} -!isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += && -QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path) - -win32 { - copy_command = xcopy /Y - source_path = $$EXTERNALS_LIB_DIR/*.dll - dest_path = $$DestRoot/bin -} -else:macx { - copy_command = rsync -avzl - source_path = $$EXTERNALS_LIB_DIR/*.{dylib,framework} - dest_path = $$DestRoot/lib -} -else:unix { - copy_command = cp - source_path = $$EXTERNALS_LIB_DIR/*.so* - dest_path = $$DestRoot/lib -} -!isEmpty(QMAKE_POST_LINK): QMAKE_POST_LINK += && -QMAKE_POST_LINK += $$copy_command $$shell_path($$source_path) $$shell_path($$dest_path) - -win32 { - dlltarget.path = $$PREFIX/bin - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/lib - INSTALLS += target -} - -package_dbus_conf.path = $$PREFIX/share/dbus-1 -package_dbus_conf.files += $$DestRoot/share/dbus-1/*.conf -INSTALLS += package_dbus_conf - -load(common_post) diff --git a/src/blackmisc/pch/pch.h b/src/blackmisc/pch/pch.h deleted file mode 100644 index 87cfe350b..000000000 --- a/src/blackmisc/pch/pch.h +++ /dev/null @@ -1,121 +0,0 @@ -// SPDX-FileCopyrightText: Copyright (C) 2017 swift Project Community / Contributors -// SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1 - -//! \file - -/* --------- - * ! WARNING ! - * --------------------------------------------------------------------------------- - * >>>> CHANGES IN ANY HEADERS INCLUDED HEREIN WILL TRIGGER A FULL REBUILD OF EVERYTHING! <<<< - * --------------------------------------------------------------------------------- - */ - -#ifdef BLACKMISC_PCH_H -# error "Don't #include this file" -#else -# define BLACKMISC_PCH_H - -# ifdef __cplusplus - -# if defined(_MSC_FULL_VER) && _MSC_FULL_VER < 191000000 -# pragma warning(disable : 4503) -# endif - -# include "blackmisc/collection.h" -# include "blackmisc/containerbase.h" -# include "blackmisc/dbus.h" -# include "blackmisc/dictionary.h" -# include "blackmisc/iterator.h" -# include "blackmisc/json.h" -# include "blackmisc/metaclass.h" -# include "blackmisc/range.h" -# include "blackmisc/sequence.h" -# include "blackmisc/valueobject.h" -# include "blackmisc/verify.h" -# include "blackmisc/worker.h" - -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include - -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include - -# endif // __cplusplus -#endif // guard diff --git a/src/blacksound/blacksound.pro b/src/blacksound/blacksound.pro deleted file mode 100644 index ca4140cca..000000000 --- a/src/blacksound/blacksound.pro +++ /dev/null @@ -1,55 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += dbus multimedia - -TARGET = blacksound -TEMPLATE = lib -CONFIG += blackconfig blackmisc - -swiftConfig(static) { - CONFIG += staticlib -} - -INCLUDEPATH += .. -DEPENDPATH += . .. - -DEFINES += LOG_IN_FILE BUILD_BLACKSOUND_LIB - -HEADERS += *.h -HEADERS += $$files($$PWD/wav/wavfile.h) -HEADERS += $$files($$PWD/dsp/*.h) -HEADERS += $$files($$PWD/codecs/*.h) -HEADERS += $$files($$PWD/sampleprovider/*.h) - -SOURCES += *.cpp -SOURCES += $$files($$PWD/wav/wavfile.cpp) -SOURCES += $$files($$PWD/dsp/*.cpp) -SOURCES += $$files($$PWD/codecs/*.cpp) -SOURCES += $$files($$PWD/sampleprovider/*.cpp) - -LIBS *= -lopus - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -OTHER_FILES += ./share/sounds/*.wav ./share/sounds/readme.txt -COPY_FILES += $$files($$PWD/share/sounds/*) -# RESOURCES += - -win32 { - dlltarget.path = $$PREFIX/bin - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/lib - INSTALLS += target -} - -package_sounds.path = $$PREFIX/share/sounds -package_sounds.files += share/sounds/*.wav -package_sounds.files += share/sounds/readme.txt -INSTALLS += package_sounds - -load(common_post) diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro deleted file mode 100644 index 181699ebf..000000000 --- a/src/plugins/plugins.pro +++ /dev/null @@ -1,12 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += simulator -SUBDIRS += weatherdata - -load(common_post) diff --git a/src/plugins/simulator/emulated/emulated.pro b/src/plugins/simulator/emulated/emulated.pro deleted file mode 100644 index 8cb328b27..000000000 --- a/src/plugins/simulator/emulated/emulated.pro +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus gui widgets network xml - -TARGET = simulatoremulated -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui -CONFIG += simulatorplugincommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -DISTFILES += simulatoremulated.json -DESTDIR = $$DestRoot/bin/plugins/simulator - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/emulatedconfig/emulatedconfig.pro b/src/plugins/simulator/emulatedconfig/emulatedconfig.pro deleted file mode 100644 index 96519c9f0..000000000 --- a/src/plugins/simulator/emulatedconfig/emulatedconfig.pro +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core widgets dbus network - -TARGET = simulatoremulatedconfig -TEMPLATE = lib -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui - -DISTFILES += simulatoremulatedconfig.json -DESTDIR = $$DestRoot/bin/plugins/simulator - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/flightgear/flightgear.pro b/src/plugins/simulator/flightgear/flightgear.pro deleted file mode 100644 index 9d8bbf461..000000000 --- a/src/plugins/simulator/flightgear/flightgear.pro +++ /dev/null @@ -1,39 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TARGET = simulatorflightgear -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui blackconfig simulatorplugincommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -unix:!macx { - INCLUDEPATH *= /usr/include/dbus-1.0 - exists (/usr/lib/x86_64-linux-gnu){ - INCLUDEPATH *= /usr/lib/x86_64-linux-gnu/dbus-1.0/include - } else { - INCLUDEPATH *= /usr/lib/dbus-1.0/include - } -} - -SOURCES += *.cpp -HEADERS += *.h -DISTFILES += simulatorflightgear.json -DESTDIR = $$DestRoot/bin/plugins/simulator - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/flightgearconfig/flightgearconfig.pro b/src/plugins/simulator/flightgearconfig/flightgearconfig.pro deleted file mode 100644 index e1df803f5..000000000 --- a/src/plugins/simulator/flightgearconfig/flightgearconfig.pro +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets - -TARGET = simulatorflightgearconfig -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -DISTFILES += simulatorflightgearconfig.json - -DESTDIR = $$DestRoot/bin/plugins/simulator - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/fs9/fs9.pro b/src/plugins/simulator/fs9/fs9.pro deleted file mode 100644 index f2587a403..000000000 --- a/src/plugins/simulator/fs9/fs9.pro +++ /dev/null @@ -1,34 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets - -TARGET = simulatorfs9 -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui blackconfig -CONFIG += simulatorfscommon simulatorplugincommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -LIBS += -luuid -ldxguid -lole32 - -SOURCES += *.cpp -HEADERS += *.h -DISTFILES += simulatorfs9.json - -DESTDIR = $$DestRoot/bin/plugins/simulator - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/fscommon/fscommon.pro b/src/plugins/simulator/fscommon/fscommon.pro deleted file mode 100644 index e9989c0f7..000000000 --- a/src/plugins/simulator/fscommon/fscommon.pro +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets - -TARGET = simulatorfscommon -TEMPLATE = lib - -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorplugincommon fsuipc - -contains(BLACK_CONFIG, Static) { - CONFIG += staticlib -} - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp -HEADERS += *.h - -DEFINES += BUILD_FSCOMMON_LIB - -swiftConfig(sims.fsuipc) { - equals(WORD_SIZE,32) { - DEFINES += SWIFT_USING_FSUIPC32 - } - equals(WORD_SIZE,64) { - DEFINES += SWIFT_USING_FSUIPC64 - } -} - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -dlltarget.path = $$PREFIX/bin -INSTALLS += dlltarget - -load(common_post) diff --git a/src/plugins/simulator/fsuipc32/fsuipc32.pro b/src/plugins/simulator/fsuipc32/fsuipc32.pro deleted file mode 100644 index 51d7eb030..000000000 --- a/src/plugins/simulator/fsuipc32/fsuipc32.pro +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -requires(equals(WORD_SIZE,32)) - -QT += core - -TARGET = fsuipc -TEMPLATE = lib - -CONFIG += staticlib - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -HEADERS += *.h -SOURCES += *.c - -DESTDIR = $$DestRoot/lib - -load(common_post) diff --git a/src/plugins/simulator/fsuipc64/fsuipc64.pro b/src/plugins/simulator/fsuipc64/fsuipc64.pro deleted file mode 100644 index c6a8406e7..000000000 --- a/src/plugins/simulator/fsuipc64/fsuipc64.pro +++ /dev/null @@ -1,23 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -requires(equals(WORD_SIZE,64)) - -QT += core - -TARGET = fsuipc -TEMPLATE = lib - -CONFIG += staticlib - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -HEADERS += *.h -SOURCES += *.c - -DESTDIR = $$DestRoot/lib - -load(common_post) diff --git a/src/plugins/simulator/fsx/fsx.pro b/src/plugins/simulator/fsx/fsx.pro deleted file mode 100644 index 74a88e1c5..000000000 --- a/src/plugins/simulator/fsx/fsx.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorfsxcommon simulatorfscommon simulatorplugincommon simconnect - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$DestRoot/bin/plugins/simulator - -SOURCES += *.cpp -HEADERS += *.h - -REQUIRES += swiftConfig(sims.fsx) -TARGET = simulatorfsx -DISTFILES += simulatorfsx.json - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/fsxcommon/fsxcommon.pro b/src/plugins/simulator/fsxcommon/fsxcommon.pro deleted file mode 100644 index 9655aa291..000000000 --- a/src/plugins/simulator/fsxcommon/fsxcommon.pro +++ /dev/null @@ -1,35 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets - -TARGET = simulatorfsxcommon -TEMPLATE = lib - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui - -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorfscommon simulatorplugincommon simconnect - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -DEFINES += BUILD_FSXCOMMON_LIB BUID_SIMCONNECT_LIB - -OTHER_FILES += \ - *.manifest \ - *.rc - -RC_FILE = $$SourceRoot/src/plugins/simulator/fsxcommon/simconnect.rc - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -dlltarget.path = $$PREFIX/bin -INSTALLS += dlltarget - -load(common_post) diff --git a/src/plugins/simulator/fsxconfig/fsxconfig.pro b/src/plugins/simulator/fsxconfig/fsxconfig.pro deleted file mode 100644 index a711bfa10..000000000 --- a/src/plugins/simulator/fsxconfig/fsxconfig.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorfsxcommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$DestRoot/bin/plugins/simulator - -SOURCES += *.cpp -HEADERS += *.h - -REQUIRES += swiftConfig(sims.fsx) -TARGET = simulatorfsxconfig -DISTFILES += simulatorfsxconfig.json - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/msfs/msfs.pro b/src/plugins/simulator/msfs/msfs.pro deleted file mode 100644 index 810cfa4e8..000000000 --- a/src/plugins/simulator/msfs/msfs.pro +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorfsxcommon simulatorfscommon simulatorplugincommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$DestRoot/bin/plugins/simulator - -SOURCES += *.cpp -HEADERS += *.h - -DEFINES += SIMCONNECT_H_NOMANIFEST -equals(WORD_SIZE,64) { - SIMCONNECT_INCLUDE += $$EXTERNALSROOT/common/include/simconnect/MSFS -} -equals(WORD_SIZE,32) { - SIMCONNECT_INCLUDE += $$EXTERNALSROOT/common/include/simconnect/FSX-XPack -} -INCLUDEPATH *= $$SIMCONNECT_INCLUDE -gcc:QMAKE_CXXFLAGS_WARN_ON += -isystem $$SIMCONNECT_INCLUDE -llvm:QMAKE_CXXFLAGS_WARN_ON *= $$clangArg(-isystem$$system_path($$SIMCONNECT_INCLUDE)) - -REQUIRES += swiftConfig(sims.msfs) -TARGET = simulatormsfs -DISTFILES += simulatormsfs.json - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/p3d/p3d.pro b/src/plugins/simulator/p3d/p3d.pro deleted file mode 100644 index 41ded8088..000000000 --- a/src/plugins/simulator/p3d/p3d.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorfsxcommon simulatorfscommon simulatorplugincommon simconnect - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$DestRoot/bin/plugins/simulator - -SOURCES += *.cpp -HEADERS += *.h - -REQUIRES += swiftConfig(sims.p3d) -TARGET = simulatorp3d -DISTFILES += simulatorp3d.json - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/p3dconfig/p3dconfig.pro b/src/plugins/simulator/p3dconfig/p3dconfig.pro deleted file mode 100644 index 1067c0a0c..000000000 --- a/src/plugins/simulator/p3dconfig/p3dconfig.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackconfig blackmisc blackcore blackgui -CONFIG += simulatorfsxcommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src -DESTDIR = $$DestRoot/bin/plugins/simulator - -SOURCES += *.cpp -HEADERS += *.h - -REQUIRES += swiftConfig(sims.p3d) -TARGET = simulatorp3dconfig -DISTFILES += simulatorp3dconfig.json - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/plugincommon/plugincommon.pro b/src/plugins/simulator/plugincommon/plugincommon.pro deleted file mode 100644 index 266a948e2..000000000 --- a/src/plugins/simulator/plugincommon/plugincommon.pro +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus xml network widgets - -TARGET = simulatorplugincommon -TEMPLATE = lib - -CONFIG += blackconfig blackmisc blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -DEFINES += BUILD_SIMULATORPLUGINCOMMON_LIB - -SOURCES += *.cpp -HEADERS += *.h - -DESTDIR = $$DestRoot/lib -DLLDESTDIR = $$DestRoot/bin - -win32 { - dlltarget.path = $$PREFIX/bin - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/lib - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/simulator.pro b/src/plugins/simulator/simulator.pro deleted file mode 100644 index c91fe64e7..000000000 --- a/src/plugins/simulator/simulator.pro +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += plugincommon -SUBDIRS += emulated -SUBDIRS += emulatedconfig - -swiftConfig(sims.fsx)|swiftConfig(sims.fs9)|swiftConfig(sims.p3d) { - equals(WORD_SIZE,32): SUBDIRS += fsuipc32 - equals(WORD_SIZE,64): SUBDIRS += fsuipc64 - SUBDIRS += fscommon -} -swiftConfig(sims.fsx)|swiftConfig(sims.p3d) { - SUBDIRS += fsxcommon -} -swiftConfig(sims.p3d) { - SUBDIRS += p3d - SUBDIRS += p3dconfig -} -swiftConfig(sims.fsx) { - SUBDIRS += fsx - SUBDIRS += fsxconfig -} -swiftConfig(sims.fs9):swiftConfig(sims.fsuipc) { - SUBDIRS += fs9 -} -swiftConfig(sims.xplane) { - SUBDIRS += xplane - SUBDIRS += xplaneconfig -} -swiftConfig(sims.fg) { - SUBDIRS += flightgear - SUBDIRS += flightgearconfig -} -swiftConfig(sims.msfs) { - SUBDIRS += msfs -} -load(common_post) diff --git a/src/plugins/simulator/xplane/xplane.pro b/src/plugins/simulator/xplane/xplane.pro deleted file mode 100644 index e8df7ac6e..000000000 --- a/src/plugins/simulator/xplane/xplane.pro +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus widgets network - -TARGET = simulatorxplane -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui blackconfig simulatorplugincommon - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -unix:!macx { - INCLUDEPATH *= /usr/include/dbus-1.0 - exists (/usr/lib/x86_64-linux-gnu){ - INCLUDEPATH *= /usr/lib/x86_64-linux-gnu/dbus-1.0/include - } else { - INCLUDEPATH *= /usr/lib/dbus-1.0/include - } -} - -SOURCES += *.cpp -HEADERS += *.h -DISTFILES += simulatorxplane.json -DESTDIR = $$DestRoot/bin/plugins/simulator - -!qtc_run:isEmpty(XSWIFTBUS_COMMIT): error(Missing XSWIFTBUS_COMMIT variable) -DEFINES += XSWIFTBUS_COMMIT=\\\"$$XSWIFTBUS_COMMIT\\\" - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro b/src/plugins/simulator/xplaneconfig/xplaneconfig.pro deleted file mode 100644 index b1c9fad28..000000000 --- a/src/plugins/simulator/xplaneconfig/xplaneconfig.pro +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets - -TARGET = simulatorxplaneconfig -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -DISTFILES += simulatorxplaneconfig.json - -DESTDIR = $$DestRoot/bin/plugins/simulator - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/simulator - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/simulator - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/weatherdata/gfs/g2clib/g2clib.pri b/src/plugins/weatherdata/gfs/g2clib/g2clib.pri deleted file mode 100644 index e9f6e69a9..000000000 --- a/src/plugins/weatherdata/gfs/g2clib/g2clib.pri +++ /dev/null @@ -1,46 +0,0 @@ -# g2clib module - -HEADERS += \ - g2clib/drstemplates.h \ - g2clib/grib2.h \ - g2clib/gridtemplates.h \ - g2clib/pdstemplates.h \ - - -SOURCES += \ - g2clib/cmplxpack.c \ - g2clib/compack.c \ - g2clib/comunpack.c \ - g2clib/drstemplates.c \ - g2clib/g2_addfield.c \ - g2clib/g2_addgrid.c \ - g2clib/g2_addlocal.c \ - g2clib/g2_create.c \ - g2clib/g2_free.c \ - g2clib/g2_getfld.c \ - g2clib/g2_gribend.c \ - g2clib/g2_info.c \ - g2clib/g2_miss.c \ - g2clib/g2_unpack1.c \ - g2clib/g2_unpack2.c \ - g2clib/g2_unpack3.c \ - g2clib/g2_unpack4.c \ - g2clib/g2_unpack5.c \ - g2clib/g2_unpack6.c \ - g2clib/g2_unpack7.c \ - g2clib/gbits.c \ - g2clib/getdim.c \ - g2clib/getpoly.c \ - g2clib/gridtemplates.c \ - g2clib/int_power.c \ - g2clib/misspack.c \ - g2clib/mkieee.c \ - g2clib/pack_gp.c \ - g2clib/pdstemplates.c \ - g2clib/rdieee.c \ - g2clib/reduce.c \ - g2clib/seekgb.c \ - g2clib/simpack.c \ - g2clib/simunpack.c \ - g2clib/specpack.c \ - g2clib/specunpack.c \ diff --git a/src/plugins/weatherdata/gfs/gfs.pro b/src/plugins/weatherdata/gfs/gfs.pro deleted file mode 100644 index 81c63f40d..000000000 --- a/src/plugins/weatherdata/gfs/gfs.pro +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core network dbus - -TARGET = weatherdatagfs -TEMPLATE = lib - -CONFIG += plugin shared -CONFIG += blackmisc blackcore blackconfig - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -include (g2clib/g2clib.pri) -SOURCES += *.cpp -HEADERS += *.h -DISTFILES += weatherdatagfs.json - -DESTDIR = $$DestRoot/bin/plugins/weatherdata - -win32 { - dlltarget.path = $$PREFIX/bin/plugins/weatherdata - INSTALLS += dlltarget -} else { - target.path = $$PREFIX/bin/plugins/weatherdata - INSTALLS += target -} - -load(common_post) diff --git a/src/plugins/weatherdata/weatherdata.pro b/src/plugins/weatherdata/weatherdata.pro deleted file mode 100644 index 637d4f1c9..000000000 --- a/src/plugins/weatherdata/weatherdata.pro +++ /dev/null @@ -1,11 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += gfs - -load(common_post) diff --git a/src/src.pro b/src/src.pro deleted file mode 100644 index d40e6ee88..000000000 --- a/src/src.pro +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -CONFIG -= declarative_debug -CONFIG -= qml_debug - -SUBDIRS += blackconfig -SUBDIRS += blackmisc - -swiftConfig(libs.blacksound) { - SUBDIRS += blacksound -} -swiftConfig(libs.blackinput) { - SUBDIRS += blackinput -} -swiftConfig(libs.blackcore) { - SUBDIRS += blackcore -} -swiftConfig(libs.blackgui) { - SUBDIRS += blackgui -} -swiftConfig(apps.swiftgui) { - SUBDIRS += swiftguistandard -} -swiftConfig(apps.swiftcore) { - SUBDIRS += swiftcore -} -swiftConfig(apps.swiftdata) { - SUBDIRS += swiftdata -} -swiftConfig(apps.swiftlauncher) { - SUBDIRS += swiftlauncher -} -swiftConfig(sims.xswiftbus) { - SUBDIRS += xswiftbus -} -SUBDIRS += plugins - -load(common_post) diff --git a/src/swiftcore/swiftcore.pro b/src/swiftcore/swiftcore.pro deleted file mode 100644 index f7a4e190c..000000000 --- a/src/swiftcore/swiftcore.pro +++ /dev/null @@ -1,42 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets multimedia - -TARGET = swiftcore -TEMPLATE = app - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -CONFIG += blackmisc blacksound blackinput blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src/blackmisc \ - $$SourceRoot/src/blacksound \ - $$SourceRoot/src/blackcore \ - $$SourceRoot/src/blackinput - -INCLUDEPATH += . $$SourceRoot/src - -OTHER_FILES += *.qss *.ico *.icns -RC_ICONS = swiftcore.ico -ICON = swiftcore.icns - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -macx { - QMAKE_TARGET_BUNDLE_PREFIX = "org.swift-project" - QMAKE_INFO_PLIST = Info.plist - - # Modifies plugin path - qtconf.path = $$PREFIX/bin/swiftcore.app/Contents/Resources - qtconf.files = qt.conf - INSTALLS += qtconf -} - -load(common_post) diff --git a/src/swiftdata/swiftdata.pro b/src/swiftdata/swiftdata.pro deleted file mode 100644 index 369efa5ae..000000000 --- a/src/swiftdata/swiftdata.pro +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets - -TARGET = swiftdata -TEMPLATE = app - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -CONFIG += blackconfig blackmisc blacksound blackinput blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src/blackmisc \ - $$SourceRoot/src/blacksound \ - $$SourceRoot/src/blackcore \ - $$SourceRoot/src/blackgui \ - $$SourceRoot/src/blackinput - -INCLUDEPATH += . $$SourceRoot/src - -OTHER_FILES += *.qss *.ico *.icns -RC_ICONS = swiftdata.ico -ICON = swiftdata.icns - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -macx { - QMAKE_TARGET_BUNDLE_PREFIX = "org.swift-project" - QMAKE_INFO_PLIST = Info.plist - - # Modifies plugin path - qtconf.path = $$PREFIX/bin/swiftdata.app/Contents/Resources - qtconf.files = qt.conf - INSTALLS += qtconf -} - -load(common_post) diff --git a/src/swiftguistandard/swiftguistandard.pro b/src/swiftguistandard/swiftguistandard.pro deleted file mode 100644 index 273a644b4..000000000 --- a/src/swiftguistandard/swiftguistandard.pro +++ /dev/null @@ -1,43 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets multimedia - -TARGET = swiftguistd -TEMPLATE = app - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -CONFIG += blackconfig blackmisc blacksound blackinput blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src/blackmisc \ - $$SourceRoot/src/blacksound \ - $$SourceRoot/src/blackcore \ - $$SourceRoot/src/blackgui \ - $$SourceRoot/src/blackinput - -INCLUDEPATH += . $$SourceRoot/src - -OTHER_FILES += *.qss *.ico *.icns -RC_ICONS = swift.ico -ICON = swift.icns - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -macx { - QMAKE_TARGET_BUNDLE_PREFIX = "org.swift-project" - QMAKE_INFO_PLIST = Info.plist - - # Modifies plugin path - qtconf.path = $$PREFIX/bin/swiftguistd.app/Contents/Resources - qtconf.files = qt.conf - INSTALLS += qtconf -} - -load(common_post) diff --git a/src/swiftlauncher/swiftlauncher.pro b/src/swiftlauncher/swiftlauncher.pro deleted file mode 100644 index 98e424886..000000000 --- a/src/swiftlauncher/swiftlauncher.pro +++ /dev/null @@ -1,44 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network widgets multimedia - -TARGET = swiftlauncher -TEMPLATE = app - -SOURCES += *.cpp -HEADERS += *.h -FORMS += *.ui -CONFIG += blackconfig blackmisc blacksound blackinput blackcore blackgui - -DEPENDPATH += . $$SourceRoot/src/blackmisc \ - $$SourceRoot/src/blacksound \ - $$SourceRoot/src/blackcore \ - $$SourceRoot/src/blackgui \ - $$SourceRoot/src/blackinput - -INCLUDEPATH += . $$SourceRoot/src - -OTHER_FILES += *.qss *.ico *.icns -RESOURCES += swiftlauncher.qrc -RC_ICONS = swiftlauncher.ico -ICON = swiftlauncher.icns - -DESTDIR = $$DestRoot/bin - -target.path = $$PREFIX/bin -INSTALLS += target - -macx { - QMAKE_TARGET_BUNDLE_PREFIX = "org.swift-project" - QMAKE_INFO_PLIST = Info.plist - - # Modifies plugin path - qtconf.path = $$PREFIX/bin/swiftlauncher.app/Contents/Resources - qtconf.files = qt.conf - INSTALLS += qtconf -} - -load(common_post) diff --git a/src/xswiftbus/version.pri b/src/xswiftbus/version.pri deleted file mode 100644 index 6fa7c0d0a..000000000 --- a/src/xswiftbus/version.pri +++ /dev/null @@ -1,13 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -# this file is included by swift.pro in the project root - -XSWIFTBUS_DEPENDENTS = $$SourceRoot/src/xswiftbus \ - $$SourceRoot/src/blackmisc/simulation/xplane/qtfreeutils.* \ - $$SourceRoot/src/blackmisc/simulation/settings/xswiftbussettingsqtfree.* - -XSWIFTBUS_COMMIT = $$system(git log -n 1 --format=%h -- $$XSWIFTBUS_DEPENDENTS) - -# make the variable available in other files without needing to be included -cache(XSWIFTBUS_COMMIT) diff --git a/src/xswiftbus/xswiftbus.pro b/src/xswiftbus/xswiftbus.pro deleted file mode 100644 index 1631c0dc7..000000000 --- a/src/xswiftbus/xswiftbus.pro +++ /dev/null @@ -1,202 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = lib - -CONFIG += shared plugin -CONFIG -= qt - -CONFIG += c++17 - -INCLUDEPATH += $$EXTERNALSROOT/common/include/XPLM - -LIBS += -levent_core -ldbus-1 - -OTHER_FILES += \ - org.swift_project.xswiftbus.*.xml \ - xswiftbus.conf - -win32 { - equals(WORD_SIZE,64): LIBS += -lXPLM_64 -lXPWidgets_64 - equals(WORD_SIZE,32): LIBS += -lXPLM -lXPWidgets -} -else:macx { - LIBS += -framework XPLM -framework XPWidgets \ - -framework Cocoa -framework CoreFoundation - DEFINES += XUTILS_EXCLUDE_MAC_CRAP=1 -} -else:unix { - # Flags needed because there is no XPLM link library - QMAKE_LFLAGS += -shared -rdynamic -nodefaultlibs -undefined_warning -Wl,--version-script=$$PWD/xswiftbus.map -} - -DEPENDPATH += . $$SourceRoot/src -INCLUDEPATH += . $$SourceRoot/src - -SOURCES += $$files($$PWD/*.cpp) -HEADERS += $$files($$PWD/*.h) - -# Using the $$files function so we can remove some with -= below -SOURCES += $$files(xplanemp2/src/*.cpp) -SOURCES += $$files(xplanemp2/src/*.c) -HEADERS += $$files(xplanemp2/src/*.h) - -SOURCES += $$files(xplanemp2/src/obj8/*.cpp) -HEADERS += $$files(xplanemp2/src/obj8/*.h) - -HEADERS += $$files(xplanemp2/include/*.h) -INCLUDEPATH += ./xplanemp2 ./xplanemp2/include ./xplanemp2/src ./xplanemp2/obj8 - -!macx: SOURCES -= xplanemp2/src/AplFSUtil.cpp - -unix:!macx { - INCLUDEPATH *= /usr/include/dbus-1.0 - exists (/usr/lib/x86_64-linux-gnu){ - INCLUDEPATH *= /usr/lib/x86_64-linux-gnu/dbus-1.0/include - } else { - INCLUDEPATH *= /usr/lib/dbus-1.0/include - } -} - -# PlatformUtils also not used -SOURCES -= $$files(xplanemp2/src/PlatformUtils.*.cpp) -HEADERS -= xplanemp2/src/PlatformUtils.h - -# Externals required by xplanemp2 -CONFIG += opengl -msvc { - CONFIG(debug, debug|release): LIBS += -lpngd -lzd -lopengl32 -lglu32 - CONFIG(release, debug|release): LIBS += -lpng -lz -lopengl32 -lglu32 -} -else:win32: LIBS += -lpng -lz -lopengl32 -lglu32 -else: LIBS += -lpng -lz - -msvc: DEFINES += _CRT_SECURE_NO_WARNINGS - -!swiftConfig(allowNoisyWarnings) { - gcc|llvm:QMAKE_CXXFLAGS_WARN_ON *= -Wno-missing-field-initializers - gcc: QMAKE_CXXFLAGS_WARN_ON *= -Wno-stringop-truncation -} - -# Required by X-Plane SDK and xplanemp2 -win32:DEFINES += IBM=1 -linux:DEFINES += LIN=1 -macx:DEFINES += APL=1 -DEFINES += XPLM200=1 -DEFINES += XPLM210=1 -DEFINES += XPLM300=1 -DEFINES += XPLM_DEPRECATED=1 - -# Name will be used in xplanemp2 log messages -DEFINES += XPMP_CLIENT_NAME=\\\"xswiftbus\\\" -DEFINES += XPMP_CLIENT_LONGNAME=\\\"xswiftbus\\\" - -DEFINES += XSWIFTBUS_VERSION=\\\"$$swiftConfig(version.full).$$VER_REV\\\" - -!qtc_run:isEmpty(XSWIFTBUS_COMMIT): error(Missing XSWIFTBUS_COMMIT variable) -DEFINES += XSWIFTBUS_COMMIT=\\\"$$XSWIFTBUS_COMMIT\\\" - -# X-Plane plugins must follow a prescribed filename and directory structure. -TARGET_EXT = .xpl -win32:TARGET = win -linux:TARGET = lin -macx:TARGET = mac - -equals(WORD_SIZE,64) { - XSWIFTBUS_DIR = xswiftbus/64 - DEFINES += WORD_SIZE_64 -} -equals(WORD_SIZE,32) { - XSWIFTBUS_DIR = xswiftbus/32 -} -XSWIFTBUS_DESTDIR = $$DestRoot/$$XSWIFTBUS_DIR - -# Default MSVC project name is $$TARGET, so use a better name -QMAKE_PROJECT_NAME = xswiftbus - -# QMake ignores TARGET_EXT on Unix - macx: QMAKE_POST_LINK += mkdir -p $$XSWIFTBUS_DESTDIR && cp $$OUT_PWD/lib$${TARGET}.dylib $$XSWIFTBUS_DESTDIR/$${TARGET}.xpl -else:unix: QMAKE_POST_LINK += mkdir -p $$XSWIFTBUS_DESTDIR && cp $$OUT_PWD/lib$${TARGET}.so $$XSWIFTBUS_DESTDIR/$${TARGET}.xpl -else: DESTDIR = $$XSWIFTBUS_DESTDIR - -target.path = $$PREFIX/$$XSWIFTBUS_DIR -target.files *= $$XSWIFTBUS_DESTDIR/$${TARGET}.xpl -target.CONFIG += no_check_exist -INSTALLS += target - -dep_target.path = $$PREFIX/$$XSWIFTBUS_DIR -dep_target.CONFIG += no_check_exist -win32 { - dep_target.files *= $$DestRoot/bin/dbus-daemon.exe - win32-g++ { - dep_target.files *= $$DestRoot/bin/libdbus-1-3.dll - dep_target.files *= $$DestRoot/bin/libevent_core.dll - } - else { - dep_target.files *= $$DestRoot/bin/dbus-1-3.dll - dep_target.files *= $$DestRoot/bin/expat.dll - dep_target.files *= $$DestRoot/bin/event_core.dll - } - - dbus_share.path = $$PREFIX/$$XSWIFTBUS_DIR/share/dbus-1 - dbus_share.files = $$DestRoot/share/dbus-1/session.conf - dbus_share.CONFIG = no_check_exist - INSTALLS += dbus_share - - legacy_data_target.path = $$PREFIX/xswiftbus - legacy_data_target.files *= LegacyData -} else:macx: { - dep_target.files *= $$DestRoot/lib/libdbus-1.3.dylib - dep_target.files *= $$DestRoot/lib/libevent_core.2.1.8.dylib - - legacy_data_target.path = $$PREFIX/xswiftbus - legacy_data_target.files *= LegacyData - - # We rely on legacy_data_target to be called after dep_target. So the library should already be installed and can be modified in place. - # We cannot modify the original library since this is xswiftbus specific. - legacy_data_target.depends += fix_plugin_rpath - fix_plugin_rpath.target = fix_plugin_rpath - fix_plugin_rpath.commands += install_name_tool -change \"@rpath/libevent_core.2.1.8.dylib\" \"@loader_path/libevent_core.2.1.8.dylib\" $$shell_path($$PREFIX/$$XSWIFTBUS_DIR/mac.xpl) && - fix_plugin_rpath.commands += install_name_tool -change \"@rpath/libdbus-1.3.dylib\" \"@loader_path/libdbus-1.3.dylib\" $$shell_path($$PREFIX/$$XSWIFTBUS_DIR/mac.xpl) - QMAKE_EXTRA_TARGETS += fix_plugin_rpath - -} else:unix: { - # Want to use wildcards in dep_target.files, but wildcard expansion happens too early, before the files exist. - dep_target.extra += $(QINSTALL) $$DestRoot/lib/libevent_core-*.so.* $$dep_target.path/`basename $$DestRoot/lib/libevent_core-*.so.*` - dep_target.extra += && - dep_target.extra += $(QINSTALL) $$DestRoot/lib/libpng*.so.* $$dep_target.path/`basename $$DestRoot/lib/libpng*.so.*` - - legacy_data_target.path = $$PREFIX/xswiftbus - legacy_data_target.files *= LegacyData -} - -win32-g++ { - equals(WORD_SIZE,32) { - dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll - } - equals(WORD_SIZE,64) { - dep_target.files *= $$[QT_INSTALL_BINS]/libgcc_s_seh-1.dll - } - dep_target.files *= $$[QT_INSTALL_BINS]/libwinpthread-1.dll - dep_target.files *= $$[QT_INSTALL_BINS]/libstdc++-6.dll -} - -conf_target.path = $$PREFIX/xswiftbus -conf_target.files *= xswiftbus.conf - -QMAKE_SUBSTITUTES += readme.txt -readme.txt.input = readme.txt.in -readme.txt.output = $$BuildRoot/generated/xswiftbus/readme.txt -GENERATED_FILES += $$BuildRoot/generated/xswiftbus/readme.txt -OTHER_FILES += readme.txt.in -readme_target.path = $$PREFIX/xswiftbus -readme_target.files *= $$BuildRoot/generated/xswiftbus/readme.txt - -INSTALLS += dep_target -INSTALLS += legacy_data_target -INSTALLS += conf_target -INSTALLS += readme_target - -load(common_post) diff --git a/swift.pro b/swift.pro deleted file mode 100644 index b8353a16a..000000000 --- a/swift.pro +++ /dev/null @@ -1,41 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -OTHER_FILES += mkspecs/features/*.prf -OTHER_FILES += mkspecs/features/*.pri -OTHER_FILES += *.supp -OTHER_FILES += .astylerc -OTHER_FILES += $$SWIFT_CONFIG_JSON - -!qtc_run { - CheckMandatoryDependency(gl) - CheckMandatoryDependency(glu) - CheckMandatoryDependency(libpng) - CheckMandatoryDependency(zlib) -} - -swiftConfig(doxygen) { - SUBDIRS += docs -} -SUBDIRS += resources -SUBDIRS += src -swiftConfig(samples) { - SUBDIRS += samples -} -swiftConfig(unitTests) { - SUBDIRS += tests -} - -llvm|gcc: system($$QMAKE_CXX --version) -else:msvc: system($$QMAKE_CXX) - -include(install.pri) - -include(src/xswiftbus/version.pri) - -load(common_post) diff --git a/tests/blackcore/blackcore.pro b/tests/blackcore/blackcore.pro deleted file mode 100644 index a9443763f..000000000 --- a/tests/blackcore/blackcore.pro +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs - -SUBDIRS += \ - context \ - fsd \ - testconnectivity \ diff --git a/tests/blackcore/context/context.pro b/tests/blackcore/context/context.pro deleted file mode 100644 index 04c4b3571..000000000 --- a/tests/blackcore/context/context.pro +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testcontext \ diff --git a/tests/blackcore/fsd/fsd.pro b/tests/blackcore/fsd/fsd.pro deleted file mode 100644 index 443753971..000000000 --- a/tests/blackcore/fsd/fsd.pro +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs - -SUBDIRS += \ - testfsdmessages \ - testfsdclient \ diff --git a/tests/blackcore/fsd/testfsdclient/testfsdclient.pro b/tests/blackcore/fsd/testfsdclient/testfsdclient.pro deleted file mode 100644 index f159e0b3a..000000000 --- a/tests/blackcore/fsd/testfsdclient/testfsdclient.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core network dbus testlib multimedia - -TARGET = testfsdclient -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += blackcore -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testfsdclient.cpp - -LIBS *= -lvatsimauth - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackcore/fsd/testfsdmessages/testfsdmessages.pro b/tests/blackcore/fsd/testfsdmessages/testfsdmessages.pro deleted file mode 100644 index 1dffb75d2..000000000 --- a/tests/blackcore/fsd/testfsdmessages/testfsdmessages.pro +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testfsdmessages -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += blackcore -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testfsdmessages.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackcore/testconnectivity/testconnectivity.pro b/tests/blackcore/testconnectivity/testconnectivity.pro deleted file mode 100644 index c969f372f..000000000 --- a/tests/blackcore/testconnectivity/testconnectivity.pro +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network testlib multimedia - -TARGET = testconnectivity -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += blackcore -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testconnectivity.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackcore/testreaders/testreaders.pro b/tests/blackcore/testreaders/testreaders.pro deleted file mode 100644 index 1a4ab2ecd..000000000 --- a/tests/blackcore/testreaders/testreaders.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testreaders -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testreaders.cpp - -DESTDIR = $$DestRoot/tests - -load(common_post) diff --git a/tests/blackgui/blackgui.pro b/tests/blackgui/blackgui.pro deleted file mode 100644 index 61f3d5539..000000000 --- a/tests/blackgui/blackgui.pro +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs - -SUBDIRS += \ - testguiutility \ diff --git a/tests/blackgui/testguiutility/testguiutility.pro b/tests/blackgui/testguiutility/testguiutility.pro deleted file mode 100644 index a87be5935..000000000 --- a/tests/blackgui/testguiutility/testguiutility.pro +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus gui testlib widgets - -TARGET = testguiutility -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += blackgui -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testguiutility.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/aviation/aviation.pro b/tests/blackmisc/aviation/aviation.pro deleted file mode 100644 index 2f9f7bd73..000000000 --- a/tests/blackmisc/aviation/aviation.pro +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testaircraftparts \ - testaircraftsituation \ - testaviation \ - testflightplan \ diff --git a/tests/blackmisc/aviation/testaircraftparts/testaircraftparts.pro b/tests/blackmisc/aviation/testaircraftparts/testaircraftparts.pro deleted file mode 100644 index 2cdaf7c1f..000000000 --- a/tests/blackmisc/aviation/testaircraftparts/testaircraftparts.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testaircraftparts -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testaircraftparts.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.pro b/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.pro deleted file mode 100644 index b404cc5cc..000000000 --- a/tests/blackmisc/aviation/testaircraftsituation/testaircraftsituation.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testaircraftsituation -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testaircraftsituation.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/aviation/testaviation/testaviation.pro b/tests/blackmisc/aviation/testaviation/testaviation.pro deleted file mode 100644 index c6cc1675d..000000000 --- a/tests/blackmisc/aviation/testaviation/testaviation.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testaviation -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testaviation.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/aviation/testflightplan/testflightplan.pro b/tests/blackmisc/aviation/testflightplan/testflightplan.pro deleted file mode 100644 index 86c40d46a..000000000 --- a/tests/blackmisc/aviation/testflightplan/testflightplan.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = testflightplan -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testflightplan.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/blackmisc.pro b/tests/blackmisc/blackmisc.pro deleted file mode 100644 index be402ceaa..000000000 --- a/tests/blackmisc/blackmisc.pro +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs - -SUBDIRS += \ - aviation \ - geo \ - input \ - math \ - pq \ - simulation \ - testcompress \ - testcontainers \ - testdatastream \ - testdbus \ - testicon \ - testidentifier \ - testlibrarypath \ - testprocess \ - testpropertyindex \ - testsharedstate \ - testsharedstate/sharedstatetestserver \ - testslot \ - teststatusmessage \ - teststringutils \ - testvaluecache \ - testvariantandmap \ - weather \ diff --git a/tests/blackmisc/geo/geo.pro b/tests/blackmisc/geo/geo.pro deleted file mode 100644 index a23d99737..000000000 --- a/tests/blackmisc/geo/geo.pro +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testgeo \ diff --git a/tests/blackmisc/geo/testgeo/testgeo.pro b/tests/blackmisc/geo/testgeo/testgeo.pro deleted file mode 100644 index 4953b5a0b..000000000 --- a/tests/blackmisc/geo/testgeo/testgeo.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testgeo -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testgeo.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/input/input.pro b/tests/blackmisc/input/input.pro deleted file mode 100644 index 66eb9decb..000000000 --- a/tests/blackmisc/input/input.pro +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testinput \ diff --git a/tests/blackmisc/input/testinput/testinput.pro b/tests/blackmisc/input/testinput/testinput.pro deleted file mode 100644 index aded8aecc..000000000 --- a/tests/blackmisc/input/testinput/testinput.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testinput -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testinput.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/math/math.pro b/tests/blackmisc/math/math.pro deleted file mode 100644 index b12668513..000000000 --- a/tests/blackmisc/math/math.pro +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testmath \ diff --git a/tests/blackmisc/math/testmath/testmath.pro b/tests/blackmisc/math/testmath/testmath.pro deleted file mode 100644 index ae41573bb..000000000 --- a/tests/blackmisc/math/testmath/testmath.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testmath -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testmath.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/pq/pq.pro b/tests/blackmisc/pq/pq.pro deleted file mode 100644 index 3cfbd8d13..000000000 --- a/tests/blackmisc/pq/pq.pro +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testphysicalquantities \ diff --git a/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.pro b/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.pro deleted file mode 100644 index 4c78b2697..000000000 --- a/tests/blackmisc/pq/testphysicalquantities/testphysicalquantities.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testphysicalquantities -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testphysicalquantities.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/simulation/simulation.pro b/tests/blackmisc/simulation/simulation.pro deleted file mode 100644 index db598b3fe..000000000 --- a/tests/blackmisc/simulation/simulation.pro +++ /dev/null @@ -1,9 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testinterpolatorlinear \ - testinterpolatormisc \ - testinterpolatorparts \ - testxplane \ diff --git a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.pro b/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.pro deleted file mode 100644 index 943949e5a..000000000 --- a/tests/blackmisc/simulation/testinterpolatorlinear/testinterpolatorlinear.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testinterpolatorlinear -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testinterpolatorlinear.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.pro b/tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.pro deleted file mode 100644 index 88f0532d0..000000000 --- a/tests/blackmisc/simulation/testinterpolatormisc/testinterpolatormisc.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testinterpolatormisc -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testinterpolatormisc.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.pro b/tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.pro deleted file mode 100644 index 506088f32..000000000 --- a/tests/blackmisc/simulation/testinterpolatorparts/testinterpolatorparts.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testinterpolatorparts -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testinterpolatorparts.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/simulation/testxplane/testxplane.pro b/tests/blackmisc/simulation/testxplane/testxplane.pro deleted file mode 100644 index 424de5cf2..000000000 --- a/tests/blackmisc/simulation/testxplane/testxplane.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = testxplane -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testxplane.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testcompress/testcompress.pro b/tests/blackmisc/testcompress/testcompress.pro deleted file mode 100644 index 7ed1ce3f0..000000000 --- a/tests/blackmisc/testcompress/testcompress.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testcompress -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testcompress.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testcontainers/testcontainers.pro b/tests/blackmisc/testcontainers/testcontainers.pro deleted file mode 100644 index d6dc760cf..000000000 --- a/tests/blackmisc/testcontainers/testcontainers.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testcontainers -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testcontainers.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testdatastream/testdatastream.pro b/tests/blackmisc/testdatastream/testdatastream.pro deleted file mode 100644 index daf624c5d..000000000 --- a/tests/blackmisc/testdatastream/testdatastream.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = testdatastream -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testdatastream.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testdbus/testdbus.pro b/tests/blackmisc/testdbus/testdbus.pro deleted file mode 100644 index db47ae9c4..000000000 --- a/tests/blackmisc/testdbus/testdbus.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = testdbus -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testdbus.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testicon/testicon.pro b/tests/blackmisc/testicon/testicon.pro deleted file mode 100644 index 22391acc4..000000000 --- a/tests/blackmisc/testicon/testicon.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testicon -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testicon.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testidentifier/testidentifier.pro b/tests/blackmisc/testidentifier/testidentifier.pro deleted file mode 100644 index 6d85209ae..000000000 --- a/tests/blackmisc/testidentifier/testidentifier.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testidentifier -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testidentifier.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testlibrarypath/testlibrarypath.pro b/tests/blackmisc/testlibrarypath/testlibrarypath.pro deleted file mode 100644 index cd74debed..000000000 --- a/tests/blackmisc/testlibrarypath/testlibrarypath.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testlibrarypath -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testlibrarypath.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testprocess/testprocess.pro b/tests/blackmisc/testprocess/testprocess.pro deleted file mode 100644 index c58143386..000000000 --- a/tests/blackmisc/testprocess/testprocess.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testprocess -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testprocess.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testpropertyindex/testpropertyindex.pro b/tests/blackmisc/testpropertyindex/testpropertyindex.pro deleted file mode 100644 index 2b61e81cf..000000000 --- a/tests/blackmisc/testpropertyindex/testpropertyindex.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = testpropertyindex -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testpropertyindex.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testsharedstate/sharedstatetestserver/sharedstatetestserver.pro b/tests/blackmisc/testsharedstate/sharedstatetestserver/sharedstatetestserver.pro deleted file mode 100644 index 8afdbda06..000000000 --- a/tests/blackmisc/testsharedstate/sharedstatetestserver/sharedstatetestserver.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus network - -TARGET = sharedstatetestserver -CONFIG -= app_bundle -CONFIG += console -CONFIG += blackconfig -CONFIG += blackmisc - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += server.cpp -HEADERS += ../testsharedstate.h - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testsharedstate/testsharedstate.pro b/tests/blackmisc/testsharedstate/testsharedstate.pro deleted file mode 100644 index a0c3deada..000000000 --- a/tests/blackmisc/testsharedstate/testsharedstate.pro +++ /dev/null @@ -1,31 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = testsharedstate -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testsharedstate.cpp -HEADERS += testsharedstate.h - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testslot/testslot.pro b/tests/blackmisc/testslot/testslot.pro deleted file mode 100644 index cb4332d4d..000000000 --- a/tests/blackmisc/testslot/testslot.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testslot -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testslot.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/teststatusmessage/teststatusmessage.pro b/tests/blackmisc/teststatusmessage/teststatusmessage.pro deleted file mode 100644 index 886687488..000000000 --- a/tests/blackmisc/teststatusmessage/teststatusmessage.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = teststatusmessage -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += teststatusmessage.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/teststringutils/teststringutils.pro b/tests/blackmisc/teststringutils/teststringutils.pro deleted file mode 100644 index 81df98c40..000000000 --- a/tests/blackmisc/teststringutils/teststringutils.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network - -TARGET = teststringutils -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += teststringutils.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testvaluecache/testvaluecache.pro b/tests/blackmisc/testvaluecache/testvaluecache.pro deleted file mode 100644 index b65630cf3..000000000 --- a/tests/blackmisc/testvaluecache/testvaluecache.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testvaluecache -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testvaluecache.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testvariantandmap/testvariantandmap.pro b/tests/blackmisc/testvariantandmap/testvariantandmap.pro deleted file mode 100644 index 65295c021..000000000 --- a/tests/blackmisc/testvariantandmap/testvariantandmap.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib - -TARGET = testvariantandmap -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testvariantandmap.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/testworker/testworker.pro b/tests/blackmisc/testworker/testworker.pro deleted file mode 100644 index 2f4bb448f..000000000 --- a/tests/blackmisc/testworker/testworker.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core testlib - -TARGET = testslot -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testworker.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/weather/testweather/testweather.pro b/tests/blackmisc/weather/testweather/testweather.pro deleted file mode 100644 index a388b8a01..000000000 --- a/tests/blackmisc/weather/testweather/testweather.pro +++ /dev/null @@ -1,30 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core dbus testlib network multimedia - -TARGET = testweather -CONFIG -= app_bundle -CONFIG += blackconfig -CONFIG += blackmisc -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests \ - -SOURCES += testweather.cpp - -DESTDIR = $$DestRoot/bin - -load(common_post) diff --git a/tests/blackmisc/weather/weather.pro b/tests/blackmisc/weather/weather.pro deleted file mode 100644 index 78c1b5b62..000000000 --- a/tests/blackmisc/weather/weather.pro +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -TEMPLATE = subdirs -SUBDIRS += \ - testweather \ diff --git a/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.pro b/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.pro deleted file mode 100644 index a15b824d1..000000000 --- a/tests/blacksimpluginfsxp3d/testblacksimpluginfsxp3d.pro +++ /dev/null @@ -1,33 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -QT += core testlib dbus network gui widgets - -TARGET = testblacksimpluginfsxp3d -CONFIG -= app_bundle -CONFIG += blackmisc blackcore blackconfig blackgui -CONFIG += simulatorfsxcommon simulatorfscommon simulatorplugincommon simconnect -CONFIG += testcase -CONFIG += no_testcase_installs - -TEMPLATE = app - -DEPENDPATH += \ - . \ - $$SourceRoot/src \ - $$SourceRoot/tests - -INCLUDEPATH += \ - $$SourceRoot/src \ - $$SourceRoot/tests - -HEADERS += *.h -SOURCES += *.cpp -DESTDIR = $$DestRoot/bin - -# Ignore linker warning about missing pdb files from Simconnect -msvc: QMAKE_LFLAGS *= /ignore:4099 - -load(common_post) diff --git a/tests/tests.pro b/tests/tests.pro deleted file mode 100644 index 18075df13..000000000 --- a/tests/tests.pro +++ /dev/null @@ -1,22 +0,0 @@ -# SPDX-FileCopyrightText: Copyright (C) swift Project Community / Contributors -# SPDX-License-Identifier: CC0-1.0 - -load(common_pre) - -TEMPLATE = subdirs -CONFIG += ordered - -SUBDIRS += blackmisc -SUBDIRS += blackcore -SUBDIRS += blackgui - -# testblackmisc.file = blackmisc/testblackmisc.pro -# testblackcore.file = blackcore/testblackcore.pro -# testblackgui.file = blackgui/testblackgui.pro - -swiftConfig(sims.fsx)|swiftConfig(sims.p3d) { - SUBDIRS += testsimpluginfsxp3d - testsimpluginfsxp3d.file = blacksimpluginfsxp3d/testblacksimpluginfsxp3d.pro -} - -load(common_post)