Update To QT6

.github/workflows/build-nightly.yaml

@@ -6,7 +6,7 @@ on:
       - 'nightly_*'
 
 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 6.9.2
 
 jobs:
   build_linux:
@@ -38,7 +38,7 @@ jobs:
         env:
           CONFIGURATION: ${{ matrix.configuration }}
         run: |
-          LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
+          LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
       - name: Run Tests
         working-directory: ./build
         env:
@@ -125,15 +125,13 @@ jobs:
           # arch: win32_msvc2017
           # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
           # aqtversion: ==0.8
-      # - name: Install Qt (64 bit)
-        # uses: jurplel/install-qt-action@v2
-        # if: ${{ matrix.arch == 'x64' }}
-        # with:
-          # version: ${{ env.QT_VERSION }}
-          # dir: ${{ github.workspace }}/..
-          # arch: win64_msvc2017_64
-          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
-          # aqtversion: ==0.8
+      - name: Install Qt (64 bit)
+        uses: jurplel/install-qt-action@v4
+        if: ${{ matrix.arch == 'x64' }}
+        with:
+          version: ${{ env.QT_VERSION }}
+          dir: ${{ github.workspace }}/..
+          arch: win64_msvc2022_64
       - name: Prepare Vulkan SDK
         uses: humbletim/setup-vulkan-sdk@v1.2.1
         with:
@@ -276,7 +274,7 @@ jobs:
         run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
       - name: Compile
         working-directory: ./build
-        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja all
+        run: LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja all
       - name: Run Tests
         working-directory: ./build
         env:

.github/workflows/build-release.yaml

@@ -6,7 +6,7 @@ on:
       - 'release_*'
 
 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 6.9.2
 
 jobs:
   create_release:
@@ -69,7 +69,7 @@ jobs:
         env:
           CONFIGURATION: ${{ matrix.configuration }}
         run: |
-          LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
+          LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
       - name: Run Tests
         working-directory: ./build
         env:
@@ -180,16 +180,14 @@ jobs:
           # arch: win32_msvc2017
           # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
           # aqtversion: ==0.8
-      # - name: Install Qt (64 bit)
+      - name: Install Qt (64 bit)
         # # Install Qt 64bit if matrix.arch == x64
-        # uses: jurplel/install-qt-action@v2
-        # if: ${{ matrix.arch == 'x64' }}
-        # with:
-          # version: ${{ env.QT_VERSION }}
-          # dir: ${{ github.workspace }}/..
-          # arch: win64_msvc2017_64
-          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
-          # aqtversion: ==0.8
+        uses: jurplel/install-qt-action@v4
+        if: ${{ matrix.arch == 'x64' }}
+        with:
+          version: ${{ env.QT_VERSION }}
+          dir: ${{ github.workspace }}/..
+          arch: win64_msvc2022_64
       - name: Prepare Vulkan SDK
         uses: humbletim/setup-vulkan-sdk@v1.2.1
         with:
@@ -346,7 +344,7 @@ jobs:
         run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
       - name: Compile
         working-directory: ./build
-        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja all
+        run: LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja all
       - name: Run Tests
         working-directory: ./build
         env:

.github/workflows/build-test.yaml

@@ -6,7 +6,7 @@ on:
       - 'test/*'
 
 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 6.9.2
 
 jobs:
   build_linux:
@@ -38,7 +38,7 @@ jobs:
         env:
           CONFIGURATION: ${{ matrix.configuration }}
         run: |
-          LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
+          LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
       - name: Run Tests
         working-directory: ./build
         env:
@@ -123,15 +123,13 @@ jobs:
           # arch: win32_msvc2017
           # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
           # aqtversion: ==0.8
-      # - name: Install Qt (64 bit)
-        # uses: jurplel/install-qt-action@v2
-        # if: ${{ matrix.arch == 'x64' }}
-        # with:
-          # version: ${{ env.QT_VERSION }}
-          # dir: ${{ github.workspace }}/..
-          # arch: win64_msvc2017_64
-          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
-          # aqtversion: ==0.8
+      - name: Install Qt (64 bit)
+        uses: jurplel/install-qt-action@v4
+        if: ${{ matrix.arch == 'x64' }}
+        with:
+          version: ${{ env.QT_VERSION }}
+          dir: ${{ github.workspace }}/..
+          arch: win64_msvc2022_64
       - name: Prepare Vulkan SDK
         uses: humbletim/setup-vulkan-sdk@v1.2.1
         with:
@@ -274,7 +272,7 @@ jobs:
         run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
       - name: Compile
         working-directory: ./build
-        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja all
+        run: LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja all
       - name: Run Tests
         working-directory: ./build
         env:

.github/workflows/cache-master.yaml

@@ -6,7 +6,7 @@ on:
       - master
 
 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 6.9.1
 
 jobs:
   build_linux:
@@ -49,10 +49,10 @@ jobs:
           JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
           CCACHE_PATH: /usr/local/bin/ccache
           ENABLE_QTFRED: ON
-          Qt5_DIR: /qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt5
+          Qt6_DIR: /qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt6
         run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
       - name: Compile
         working-directory: ./build
-        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
+        run: LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
       - name: Show CCache statistics
         run: ccache --show-stats

.github/workflows/test-pull_request.yaml

@@ -3,7 +3,7 @@ name: Check a pull request
 on: [pull_request]
 
 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 6.9.2
 
 jobs:
   build_linux:
@@ -52,11 +52,11 @@ jobs:
           JOB_CMAKE_OPTIONS: ${{ matrix.cmake_options }}
           CCACHE_PATH: /usr/local/bin/ccache
           ENABLE_QTFRED: ON
-          Qt5_DIR: /qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt5
+          Qt6_DIR: /qt/${{ env.QT_VERSION }}/gcc_64/lib/cmake/Qt6
         run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
       - name: Compile
         working-directory: ./build
-        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
+        run: LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja -k 20 all
       - name: Run Tests
         working-directory: ./build
         env:
@@ -90,30 +90,26 @@ jobs:
         name: Checkout
         with:
           submodules: true
-      # - name: Cache Qt
-        # id: cache-qt-win
-        # uses: actions/cache@v1
-        # with:
-          # path: ${{ github.workspace }}/../Qt
+      #- name: Cache Qt
+        #id: cache-qt-win
+        #uses: actions/cache@v4https://github.com/jurplel/install-qt-action
+        #with:
+           #path: ${{ github.workspace }}/../Qt
           # key: ${{ runner.os }}-${{ matrix.arch }}-QtCache-${{ env.QT_VERSION }}
-      # - name: Install Qt (32 bit)
-        # uses: jurplel/install-qt-action@v2
-        # if: ${{ matrix.compiler  == 'MSVC' && matrix.arch == 'Win32' }}
-        # with:
-          # version: ${{ env.QT_VERSION }}
-          # dir: ${{ github.workspace }}/..
-          # arch: win32_msvc2017
-          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
-          # aqtversion: ==0.8
-      # - name: Install Qt (64 bit)
-        # uses: jurplel/install-qt-action@v2
-        # if: ${{ matrix.compiler  == 'MSVC' && matrix.arch == 'x64' }}
-        # with:
-          # version: ${{ env.QT_VERSION }}
-          # dir: ${{ github.workspace }}/..
-          # arch: win64_msvc2017_64
-          # cached: ${{ steps.cache-qt-win.outputs.cache-hit }}
-          # aqtversion: ==0.8
+      #- name: Install Qt (32 bit)
+      #  uses: jurplel/install-qt-action@v4
+      #  if: ${{ matrix.compiler  == 'MSVC' && matrix.arch == 'Win32' }}
+      #  with:
+      #     version: ${{ env.QT_VERSION }}
+      #     dir: ${{ github.workspace }}/..
+      #     arch: win32_msvc2022
+      - name: Install Qt (64 bit)
+        uses: jurplel/install-qt-action@v4
+        if: ${{ matrix.compiler  == 'MSVC' && matrix.arch == 'x64' }}
+        with:
+           version: ${{ env.QT_VERSION }}
+           dir: ${{ github.workspace }}/..
+           arch: win64_msvc2022_64
       - name: Prepare Vulkan SDK
         uses: humbletim/setup-vulkan-sdk@v1.2.1
         with:
@@ -146,7 +142,7 @@ jobs:
               else
                   cmake -DFSO_USE_SPEECH="ON" -DFSO_FATAL_WARNINGS="ON" -DFSO_USE_VOICEREC="OFF" -DFSO_BUILD_TESTS="ON" \
                       -DFORCED_SIMD_INSTRUCTIONS=SSE2 -DFSO_BUILD_FRED2="ON" -G "Visual Studio 17 2022" \
-                      -DFSO_BUILD_QTFRED=OFF -T "v143" -A "$ARCHITECTURE" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
+                      -DFSO_BUILD_QTFRED="ON" -T "v143" -A "$ARCHITECTURE" -DCMAKE_BUILD_TYPE=$CONFIGURATION ..
               fi
           fi
       - name: Compile
@@ -225,7 +221,7 @@ jobs:
         run: $GITHUB_WORKSPACE/ci/linux/configure_cmake.sh
       - name: Compile
         working-directory: ./build
-        run: LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH ninja all
+        run: LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH ninja all
       - name: Run Tests
         working-directory: ./build
         env:

.github/workflows/weekly-coverity-scan.yaml

@@ -11,7 +11,7 @@ on:
     - cron: "5 0 * * 5" # Run once per a week on Friday morning (midnight UTC, 4 AM EST), to avoid Coverity's submission limits
 
 env:
-  QT_VERSION: 5.12.12
+  QT_VERSION: 6.9.1
   coverity_email: SirKnightlySCP@gmail.com
   coverity_token: ${{ secrets.COVERITY_TOKEN }}
 

ci/linux/configure_cmake.sh

@@ -13,7 +13,7 @@ if [ "$COMPILER" = "clang-16" ]; then
     export CXX=clang++-16
 fi
 
-LD_LIBRARY_PATH=$Qt5_DIR/lib:$LD_LIBRARY_PATH
+LD_LIBRARY_PATH=$Qt6_DIR/lib:$LD_LIBRARY_PATH
 if [ "$RUNNER_OS" = "macOS" ]; then
     CXXFLAGS="-mtune=generic -pipe -Wno-unknown-pragmas"
     CFLAGS="-mtune=generic -pipe -Wno-unknown-pragmas"

ci/linux/generate_appimage.sh

@@ -31,7 +31,7 @@ cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_FOLDER/Freespace2 -DCOMPONENT=Unspecified
 cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_FOLDER/Freespace2 -DCOMPONENT=Freespace2 -P cmake_install.cmake
 
 # We need to be a bit creative for determining the AppImage name since we don't want to hard-code the name
-FILENAME="$(find $INSTALL_FOLDER/Freespace2/bin -name 'fs2_open_*' -type f -printf "%f\n").AppImage"
+FILENAME="$(find $INSTALL_FOLDER/Freespace2/bin -maxdepth 1 -name 'fs2_open_*' -type f -executable -printf "%f\n").AppImage"
 ./bin/appimagetool -n "$INSTALL_FOLDER/Freespace2" "$INSTALL_FOLDER/$FILENAME"
 chmod +x "$INSTALL_FOLDER/$FILENAME"
 
@@ -41,7 +41,7 @@ if [ -f qtfred/cmake_install.cmake ]; then
 	cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_FOLDER/qtFRED -DCOMPONENT=qtFRED -P cmake_install.cmake
 
 	# We need to be a bit creative for determining the AppImage name since we don't want to hard-code the name
-	FILENAME="$(find $INSTALL_FOLDER/qtFRED/bin -iname 'qtfred_*' -type f -printf "%f\n").AppImage"
+	FILENAME="$(find $INSTALL_FOLDER/qtFRED/bin -maxdepth 1 -iname 'qtfred_*' -type f -executable -printf "%f\n").AppImage"
 	./bin/appimagetool -n "$INSTALL_FOLDER/qtFRED" "$INSTALL_FOLDER/$FILENAME"
 	chmod +x "$INSTALL_FOLDER/$FILENAME"
 fi

cmake/platform-darwin.cmake

@@ -12,7 +12,8 @@ endif()
 target_link_libraries(platform INTERFACE ${COCOA_LIBRARY})
 
 # To support C++17 we need to target at least 10.13. maybe 10.14 for some rare features
-SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
+# bump to 10.15 for c++17 std::filesystem usage in qtFRED
+SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.15")
 
 SET(CMAKE_SKIP_RPATH FALSE)
 SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)

code/cfile/cfile.cpp

@@ -85,7 +85,7 @@ cf_pathtype Pathtypes[CF_MAX_PATH_TYPES]  = {
 	{ CF_TYPE_INTEL_ANIMS,			"data" DIR_SEPARATOR_STR "intelanims",										".pcx .ani .eff .tga .jpg .png .dds .ktx",	CF_TYPE_DATA	},
 	{ CF_TYPE_SCRIPTS,				"data" DIR_SEPARATOR_STR "scripts",											".lua .lc .fnl",						CF_TYPE_DATA	},
 	{ CF_TYPE_FICTION,				"data" DIR_SEPARATOR_STR "fiction",											".txt",								CF_TYPE_DATA	}, 
-	{ CF_TYPE_FREDDOCS,				"data" DIR_SEPARATOR_STR "freddocs",										".html .qch .css .png .jpg",	CF_TYPE_DATA	}
+	{ CF_TYPE_FREDDOCS,				"data" DIR_SEPARATOR_STR "freddocs",										".html .css .png .jpg",	CF_TYPE_DATA	}
 };
 // clang-format on
 

code/math/bitarray.h

@@ -19,7 +19,7 @@
  * A 0 (1) bit corresponds to the Boolean value false (true), respectively. We can look at a stream of bytes
  * as a stream of bits; each byte contains 8 bits, so any n bytes hold n*8 bits. And the operation to
  * manipulate this stream or bit array is so easy, just read or change the bit's state or make any Boolean
- * operation on the whole bits array, like ‘AND’, ‘OR’, or ‘XOR’.
+ * operation on the whole bits array, like 'AND', 'OR', or 'XOR'.
  *
  * As each byte contains 8 bits, we need to divide the bit number by 8 to reach the byte that holds the bit.
  * Then, we can seek to the right bit in the reached byte by the remainder of dividing the bit number by 8.

lib/CMakeLists.txt

@@ -53,10 +53,10 @@ ADD_SUBDIRECTORY(lz4)
 
 set(HIDAPI_WITH_LIBUSB OFF)
 set(HIDAPI_WITH_HIDRAW ON)
-add_subdirectory(hidapi)
+add_subdirectory(hidapi EXCLUDE_FROM_ALL)
 
 ADD_SUBDIRECTORY(imgui)
 
 if(FSO_BUILD_WITH_OPENXR)
-	add_subdirectory(openxr)
+	add_subdirectory(openxr EXCLUDE_FROM_ALL)
 endif()

lib/antlr4.cmake

@@ -18,7 +18,7 @@ endif()
 set(WITH_DEMO FALSE)
 set(ANTLR4_INSTALL FALSE)
 
-add_subdirectory(antlr4-cpp-runtime)
+add_subdirectory(antlr4-cpp-runtime EXCLUDE_FROM_ALL)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_LIST_DIR}/antlr4-cpp-runtime/cmake" PARENT_SCOPE)
 suppress_warnings(antlr4_static)