[ci] global: update to Qt 6.5.0 LTS

FastTrackOrg · May 16, 2023 · 371b378 · 371b378
1 parent 864998e
commit 371b378
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.4.2
+  QT_VERSION: 6.5.0
   OPENCV_VERSION: 4.7.0
 
 jobs:
@@ -26,10 +26,10 @@ jobs:
             sudo apt-get install libavcodec-dev libavformat-dev libswscale-dev libnss3
             sudo apt-get install libgstreamer-plugins-base1.0-dev libgstreamer1.0-dev
             sudo apt-get install libopencv-dev
-      - name: install_qt
+      - name: install_qt6
         run: |
           pip install aqtinstall
-          python3 -m aqt install-qt -m qtcharts -O ${{ github.workspace }}/Qt/ linux desktop ${{ env.QT_VERSION }}
+          python3 -m aqt install-qt -O ${{ github.workspace }}/Qt/ linux desktop ${{ env.QT_VERSION }}
           echo ${{ github.workspace }}/Qt/${{ env.QT_VERSION }}/gcc_64/bin/ >> $GITHUB_PATH
       - name: build_ft
         run: |
@@ -84,7 +84,7 @@ jobs:
           cd build/
           mkdir FastTrack
           cp FastTrack.exe FastTrack
-          windeployqt FastTrack/FastTrack.exe #https://bugreports.qt.io/browse/QTBUG-62103?jql=status%20%3D%20Open%20AND%20text%20~%20%22windeployqt%20platform%22
+          windeployqt FastTrack/FastTrack.exe --no-translations  # https://bugreports.qt.io/browse/QTBUG-62103?jql=status%20%3D%20Open%20AND%20text%20~%20%22windeployqt%20platform%22 and https://bugreports.qt.io/browse/QTBUG-112204
           cp ..\assets\icon.ico FastTrack
           cp ${{ github.workspace }}/Qt/Tools/mingw*/bin/libgomp-1.dll FastTrack
           cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/opencv_videoio_ffmpeg470_64.dll FastTrack

diff --git a/.github/workflows/build_cli.yml b/.github/workflows/build_cli.yml
@@ -5,7 +5,7 @@ on:
     branches: [master]
 
 env:
-  QT_VERSION: 6.4.2
+  QT_VERSION: 6.5.0
   OPENCV_VERSION: 4.7.0
 
 jobs:
@@ -76,8 +76,9 @@ jobs:
           qmake FastTrack-Cli.pro -spec win32-g++ CONFIG+=release
           mingw32-make
           mingw32-make clean
+          chmod -777 build_cli
           cd build_cli/
-          windeployqt FastTrack-Cli.exe #https://bugreports.qt.io/browse/QTBUG-62103?jql=status%20%3D%20Open%20AND%20text%20~%20%22windeployqt%20platform%22
+          windeployqt FastTrack-Cli.exe --no-translations  # https://bugreports.qt.io/browse/QTBUG-62103?jql=status%20%3D%20Open%20AND%20text%20~%20%22windeployqt%20platform%22 and https://bugreports.qt.io/browse/QTBUG-112204
           cp ..\assets\icon.ico .
           cp ${{ github.workspace }}/Qt/Tools/mingw*/bin/libgomp-1.dll .
           cp ${{ github.workspace }}/OpenCV_MinGW_64/bin/opencv_videoio_ffmpeg470_64.dll .

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,7 +8,7 @@ on:
     branches:
     - master
 env:
-  QT_VERSION: 6.4.2
+  QT_VERSION: 6.5.0
   OPENCV_VERSION: 4.7.0
 
 jobs:

diff --git a/src/FastTrack.pro b/src/FastTrack.pro
@@ -1,4 +1,4 @@
-greaterThan(QT_MAJOR_VERSION, 5): QT += widgets core gui network svg sql charts
+greaterThan(QT_MAJOR_VERSION, 5): QT += widgets core gui network svg sql
 
 TEMPLATE = app
 include("../FastTrack.pri")