Update Qt version

emericg · Jun 18, 2024 · d091834 · d091834
1 parent 5c65212
commit d091834
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 54 deletions.
diff --git a/.github/workflows/builds_desktop_qmake.yml b/.github/workflows/builds_desktop_qmake.yml
@@ -15,7 +15,7 @@ on:
 env:
   APP_NAME: "toolBLEx"
   APP_VERSION: "0.12"
-  QT_VERSION: "6.6.3"
+  QT_VERSION: "6.7.2"
 
 #-------------------------------------------------------------------------------
 # Workflow jobs
@@ -35,10 +35,10 @@ jobs:
 
       # Install Qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
 
       # Install dependencies (from package manager)
       - name: Install dependencies (from package manager)
@@ -94,10 +94,10 @@ jobs:
 
       # Install Qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
 
       # Setup env
       - name: Setup env
@@ -137,14 +137,13 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
         with:
           arch: x64
-          spectre: true
 
       # Install Qt
       - name: Install Qt
-        uses: jurplel/install-qt-action@v3
+        uses: jurplel/install-qt-action@v4
         with:
           version: ${{env.QT_VERSION}}
-          modules: qtconnectivity qtcharts qtshadertools qt5compat
+          modules: qtconnectivity qtcharts
 
       # Install NSIS (already installed in 'windows-2022')
       #- name: Install NSIS

diff --git a/assets/linux/toolblex.flatpak.yml b/assets/linux/toolblex.flatpak.yml
@@ -45,8 +45,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtbase-everywhere-src-6.7.0.tar.xz
-        sha256: 11b2e29e2e52fb0e3b453ea13bbe51a10fdff36e1c192d8868c5a40233b8b254
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtbase-everywhere-src-6.7.2.tar.xz
+        sha256: c5f22a5e10fb162895ded7de0963328e7307611c688487b5d152c9ee64767599
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -65,30 +65,14 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qttools-everywhere-src-6.7.0.tar.xz
-        sha256: c8da6b239e82fe1e23465cbf0936c0da5a334438d3fb433e19c503cbb1abee7b
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qttools-everywhere-src-6.7.2.tar.xz
+        sha256: 58e855ad1b2533094726c8a425766b63a04a0eede2ed85086860e54593aa4b2a
         x-checker-data:
           type: anitya
           project-id: 7927
           stable-only: true
           url-template: https://download.qt.io/archive/qt/$major.$minor/$version/submodules/qttools-everywhere-src-$version.tar.xz
 
-  - name: qt-shadertools
-    buildsystem: cmake-ninja
-    builddir: true
-    config-opts:
-      - -DQT_BUILD_EXAMPLES=OFF
-      - -DQT_BUILD_TESTS=OFF
-    sources:
-      - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtshadertools-everywhere-src-6.7.0.tar.xz
-        sha256: 3e13f967c62f0815c901e754cbc472a2e19170da0c7a505230d559615f7998af
-        x-checker-data:
-          type: anitya
-          project-id: 7927
-          stable-only: true
-          url-template: https://download.qt.io/archive/qt/$major.$minor/$version/submodules/qtshadertools-everywhere-src-$version.tar.xz
-
   - name: qtdeclarative
     buildsystem: cmake-ninja
     builddir: true
@@ -99,8 +83,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtdeclarative-everywhere-src-6.7.0.tar.xz
-        sha256: 5a0c39579a74d7cca581162c866ed0887287d4f8d5abff7ab9492d4a58fa9e2c
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtdeclarative-everywhere-src-6.7.2.tar.xz
+        sha256: 4c29cba1af8c42d425d8eb6e01bad24cb80f4b983d71eef566a0542dfdb9b999
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -115,8 +99,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtwayland-everywhere-src-6.7.0.tar.xz
-        sha256: d73470e4217da388d8cd2a517ee8bb373853f33c569306e80f04397845157aea
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtwayland-everywhere-src-6.7.2.tar.xz
+        sha256: a2a057e1dd644bd44abb9990fecc194b2e25c2e0f39e81aa9fee4c1e5e2a8a5b
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -133,8 +117,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtsvg-everywhere-src-6.7.0.tar.xz
-        sha256: 1518f40e08ff5e6153a6e26e5b95b033413ac143b70795dc1317e7f73ebf922d
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtsvg-everywhere-src-6.7.2.tar.xz
+        sha256: fb0d1286a35be3583fee34aeb5843c94719e07193bdf1d4d8b0dc14009caef01
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -149,8 +133,8 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtconnectivity-everywhere-src-6.7.0.tar.xz
-        sha256: 07afd6aac19ff73c8ba1471057f43d4ef2737d6a8a772393ec907988dd71244c
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtconnectivity-everywhere-src-6.7.2.tar.xz
+        sha256: 8ed321b242f0e956473a295fa31670271f9b3acb797508644cb740f89f6c08e8
         x-checker-data:
           type: anitya
           project-id: 7927
@@ -165,30 +149,14 @@ modules:
       - -DQT_BUILD_TESTS=OFF
     sources:
       - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qtcharts-everywhere-src-6.7.0.tar.xz
-        sha256: 899d5498c91bfb01fde2ff2438c82adf4d4d9b3cf646e7ad7b0036dbf32b7ca4
+        url: https://download.qt.io/archive/qt/6.7/6.7.2/submodules/qtcharts-everywhere-src-6.7.2.tar.xz
+        sha256: 00f6a437458b7f2c4e81d748dbe2a077567a9e6ad8d8e3820b36c39dc5279bda
         x-checker-data:
           type: anitya
           project-id: 7927
           stable-only: true
           url-template: https://download.qt.io/archive/qt/$major.$minor/$version/submodules/qtcharts-everywhere-src-$version.tar.xz
 
-  - name: qt5compat
-    buildsystem: cmake-ninja
-    config-opts:
-      - -DCMAKE_BUILD_TYPE=RelWithDebInfo
-      - -DQT_BUILD_EXAMPLES=OFF
-      - -DQT_BUILD_TESTS=OFF
-    sources:
-      - type: archive
-        url: https://download.qt.io/archive/qt/6.7/6.7.0/submodules/qt5compat-everywhere-src-6.7.0.tar.xz
-        sha256: 9d49d4fd8345d8a40b63e0b65cd49c1d8286e33a7f1409bf1316763f654e19f5
-        x-checker-data:
-          type: anitya
-          project-id: 7927
-          stable-only: true
-          url-template: https://download.qt.io/archive/qt/$major.$minor/$version/submodules/qt5compat-everywhere-src-$version.tar.xz
-
   - name: toolblex
     buildsystem: qmake
     sources: