Merge pull request #44 from scratchcpp/qt_6.7

Update to Qt 6.7

Author: adazem009

.github/workflows/linux-build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        qt-version: ['6.6']
+        qt-version: ['6.7']
         qt-target: ['desktop']
         qt-modules: ['']
         arch: ['amd64']
@@ -37,10 +37,11 @@ jobs:
     ## Install Qt
     - if: contains(matrix.arch, 'amd64')
       name: Install Qt (Ubuntu)
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt-version }}
         host: 'linux'
+        arch: 'linux_gcc_64'
         target: ${{ matrix.qt-target }}
         modules: ${{ matrix.qt-modules }}
     - if: "!contains(matrix.arch, 'amd64')"

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     strategy:
       matrix:
-        qt-version: ['6.6']
+        qt-version: ['6.7']
         qt-target: ['desktop']
         qt-modules: ['']
         arch: ['amd64']
@@ -48,10 +48,11 @@ jobs:
     # Install Qt
     - if: contains(matrix.arch, 'amd64')
       name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt-version }}
         host: 'linux'
+        arch: 'linux_gcc_64'
         target: ${{ matrix.qt-target }}
         modules: ${{ matrix.qt-modules }}
     - if: "!contains(matrix.arch, 'amd64')"
@@ -91,7 +92,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        qt-version: ['6.6']
+        qt-version: ['6.7']
         qt-target: ['desktop']
         qt-modules: ['']
         mingw-version: ['11.2.0']
@@ -123,7 +124,7 @@ jobs:
       shell: bash
     # Install Qt
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt-version }}
         host: 'windows'
@@ -155,6 +156,12 @@ jobs:
         cd win_release
         windeployqt ${{ env.executable_name }}.exe --qmldir ..\win_build\src || exit 5
       shell: cmd
+    - name: Copy libraries
+      run: |
+        cp ${QT_ROOT_DIR}/bin/libgcc_s_seh-1.dll win_release/
+        cp ${QT_ROOT_DIR}/bin/libstdc++-6.dll win_release/
+        cp ${QT_ROOT_DIR}/bin/libwinpthread-1.dll win_release/
+      shell: bash
     # Update Windows repository
     - if: env.create_windows_installer == 1 && env.is_prerelease == 1
       name: Do not update Windows repo if this is a pre-release

.github/workflows/utests.yml

@@ -24,9 +24,10 @@ jobs:
         sudo apt-get install -y nlohmann-json3-dev libutfcpp-dev xvfb libxcb-cursor0
       shell: bash
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '6.6.*'
+        version: '6.7.*'
+        arch: 'linux_gcc_64'
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DSCRATCHCPP_PLAYER_BUILD_UNIT_TESTS=ON
 

.github/workflows/windows-build.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-        qt-version: ['6.6']
+        qt-version: ['6.7']
         qt-target: ['desktop']
         qt-modules: ['']
         mingw-version: ['11.2.0']
@@ -35,7 +35,7 @@ jobs:
       shell: bash
     ## Install Qt
     - name: Install Qt
-      uses: jurplel/install-qt-action@v3
+      uses: jurplel/install-qt-action@v4
       with:
         version: ${{ matrix.qt-version }}
         host: 'windows'
@@ -67,6 +67,12 @@ jobs:
         cd win_release
         windeployqt ${{ env.executable_name }}.exe --qmldir ..\win_build\src || exit 5
       shell: cmd
+    - name: Copy libraries
+      run: |
+        cp ${QT_ROOT_DIR}/bin/libgcc_s_seh-1.dll win_release/
+        cp ${QT_ROOT_DIR}/bin/libstdc++-6.dll win_release/
+        cp ${QT_ROOT_DIR}/bin/libwinpthread-1.dll win_release/
+      shell: bash
     ## Upload
     - name: Upload artifacts
       uses: actions/upload-artifact@v3