Preparations for Qt6 upgrade

.github/workflows/build.yml

@@ -82,7 +82,7 @@ jobs:
           path: docs/html/
 
   buildLinux:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: [preBuild, checks]
     env:
       BACKTRACE_SYMBOL_TOKEN: ${{ secrets.BACKTRACE_SYMBOL_TOKEN }}
@@ -183,13 +183,13 @@ jobs:
 
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.qt_version }}
           arch: win64_msvc2019_64
           cache: true
       - name: Install Qt debug info
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.qt_version }}
           arch: win64_msvc2019_64
@@ -280,7 +280,7 @@ jobs:
 
     steps:
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{ env.qt_version }}
           cache: true

CMakeLists.txt

@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.26)
 
 if(APPLE)
     set(CMAKE_OSX_ARCHITECTURES "x86_64")
-    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
 endif()
 
 set(SWIFT_LANGUAGES C CXX)

cmake/pch_config.cmake

@@ -41,7 +41,6 @@ set(SWIFT_MISC_PCH
     <QJsonValue>
     <QJsonValueRef>
     <QLatin1Char>
-    <QLatin1Literal>
     <QLatin1String>
     <QList>
     <QLoggingCategory>

cmake/tools.cmake

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-swift-pilot-client-1
 
 macro(get_version_number)
-    execute_process(COMMAND python scripts/utils.py --version
+    execute_process(COMMAND python3 scripts/utils.py --version
                 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
                 OUTPUT_VARIABLE SWIFT_VERSION
                 OUTPUT_STRIP_TRAILING_WHITESPACE)

installer/installbuilder/vcredist-x64.xml

@@ -38,7 +38,7 @@ Error Code: ${program_exit_code}
 Check if another version was already installed and if not, try to run the installer manually from
 ${installdir}\vcredist\
 
-The installation will now continue, but swift might not work properly. If this is the case, raise an issue at http://tiny.cc/swift-issue with the error code, you received.</text>
+The installation will now continue, but swift might not work properly. If this is the case, raise an issue at https://github.com/swift-project/pilotclient/issues with the error code, you received.</text>
                     <ruleList>
                         <!-- No error -->
                         <compareValues>

installer/installbuilder/vcredist-x86.xml

@@ -38,7 +38,7 @@ Error Code: ${program_exit_code}
 Check if another version was already installed and if not, try to run the installer manually from
 ${installdir}\vcredist\
 
-The installation will now continue, but swift might not work properly. If this is the case, raise an issue at http://tiny.cc/swift-issue with the error code, you received.</text>
+The installation will now continue, but swift might not work properly. If this is the case, raise an issue at https://github.com/swift-project/pilotclient/issues with the error code, you received.</text>
                     <ruleList>
                         <!-- No error -->
                         <compareValues>

samples/blackmisc/samplesperformance.cpp

@@ -263,7 +263,7 @@ namespace BlackSample
 
         timer.start();
         situations.convertFromJson(json);
-        out << "Convert 100,000 aircraft situations from JSON:      " << timer.elapsed() << "ms" << endl
+        out << "Convert 100,000 aircraft situations from JSON:      " << timer.elapsed() << "ms" << Qt::endl
             << Qt::endl;
 
         timer.start();
@@ -272,7 +272,7 @@ namespace BlackSample
 
         timer.start();
         models.convertFromJson(json);
-        out << "Convert 10,000 aircraft models from JSON (naive):   " << timer.elapsed() << "ms" << endl
+        out << "Convert 10,000 aircraft models from JSON (naive):   " << timer.elapsed() << "ms" << Qt::endl
             << Qt::endl;
 
         timer.start();
@@ -281,7 +281,7 @@ namespace BlackSample
 
         timer.start();
         models.convertFromMemoizedJson(json);
-        out << "Convert 10,000 aircraft models from JSON (memoize): " << timer.elapsed() << "ms" << endl
+        out << "Convert 10,000 aircraft models from JSON (memoize): " << timer.elapsed() << "ms" << Qt::endl
             << Qt::endl;
 
         return EXIT_SUCCESS;
@@ -383,7 +383,7 @@ namespace BlackSample
             auto c = s.contains(upperRegex);
             Q_UNUSED(c);
         }
-        out << "Check 100,000 strings for containing uppercase letter: (regex)       " << timer.elapsed() << "ms" << endl
+        out << "Check 100,000 strings for containing uppercase letter: (regex)       " << timer.elapsed() << "ms" << Qt::endl
             << Qt::endl;
 
         timer.start();
@@ -400,7 +400,7 @@ namespace BlackSample
             auto i = s.indexOf(upperRegex);
             Q_UNUSED(i);
         }
-        out << "Check 100,000 strings for index of first uppercase letter: (regex)   " << timer.elapsed() << "ms" << endl
+        out << "Check 100,000 strings for index of first uppercase letter: (regex)   " << timer.elapsed() << "ms" << Qt::endl
             << Qt::endl;
 
         auto temp = strings;
@@ -417,7 +417,7 @@ namespace BlackSample
         {
             s.remove(upperRegex);
         }
-        out << "Remove from 100,000 strings all uppercase letters: (regex)           " << timer.elapsed() << "ms" << endl
+        out << "Remove from 100,000 strings all uppercase letters: (regex)           " << timer.elapsed() << "ms" << Qt::endl
             << Qt::endl;
 
         timer.start();

samples/weatherdata/weatherdataprinter.cpp

@@ -52,7 +52,7 @@ void CWeatherDataPrinter::fetchAndPrintWeatherData(const CCoordinateGeodetic &po
 void CWeatherDataPrinter::printWeatherData(const CWeatherGrid &weatherGrid)
 {
     QTextStream qtout(stdout);
-    qtout << "... finished." << endl;
+    qtout << "... finished." << Qt::endl;
     qtout << weatherGrid.getDescription();
-    qtout << endl;
+    qtout << Qt::endl;
 }