Port to Qt6 (#110)

* Port to Qt6 * Try to fix workflows for qt6 * Fix concurrent runs * Fix concurrent runs * Try to fix windows workflow
azagaya · Oct 10, 2024 · cf57b34 · cf57b34
1 parent 539a9bc
commit cf57b34
Show file tree

Hide file tree

Showing 15 changed files with 211 additions and 102 deletions.
diff --git a/.github/workflows/laigter-linux.yaml b/.github/workflows/laigter-linux.yaml
@@ -9,23 +9,28 @@ jobs:
 
     steps:
     - name: checkout sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: add build dependencies
+    - name: Install Dependencies
+      shell: bash
       run: |
-        apt update
-        apt install -y software-properties-common clang make wget libomp-dev
-        add-apt-repository ppa:beineri/opt-qt-5.15.2-focal
-        apt-get update
-        apt install -y qt515base qt515x11extras qt515tools libgl1-mesa-dev qt515imageformats
-        
-    - name: build Laigter
+        apt-get update && apt-get install -y sudo p7zip-full wget file
+        sudo ln -fs /usr/share/zoneinfo/UTC /etc/localtime
+        sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends software-properties-common
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: '6.8.0'
+        arch: 'linux_gcc_64'
+        extra: '--external 7z'
+        modules: 'qtimageformats'
+
+    - name: Build Laigter
       shell: bash
       run: |
         echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-        source /opt/qt*/bin/qt*-env.sh || true
-        export CXX=clang++
-        /opt/qt515/bin/qmake -spec linux-clang CONFIG+=release PREFIX=/usr
+        qmake CONFIG+=release PREFIX=/usr
         make -j$(nproc)
         make INSTALL_ROOT=appdir install
         find appdir/
@@ -37,7 +42,7 @@ jobs:
         ./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -extra-plugins=imageformats -appimage -verbose=2
 
     - name: upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: test-artifact
         path: Laigter-x86_64.AppImage 

diff --git a/.github/workflows/laigter-mac.yaml b/.github/workflows/laigter-mac.yaml
@@ -6,18 +6,19 @@ jobs:
     runs-on: macOS-latest
     steps:
     - name: checkout sources
-      uses: actions/checkout@v2
-    - name: setup Homebrew
-      shell: bash
-      run: |
-        rm /usr/local/bin/2to3* 
-        export HOMEBREW_NO_AUTO_UPDATE=1 && export HOMEBREW_NO_INSTALL_CLEANUP=1 && brew update
-        HOMEBREW_VERBOSE_USING_DOTS=1 brew reinstall --verbose qt@5
-        brew link qt@5 --force
+      uses: actions/checkout@v4
+
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: '6.8.0'
+        extra: '--external 7z'
+        arch: 'clang_64'
+        modules: 'qtimageformats'
+
     - name: build Laigter
       shell: bash
       run: |
-        export PATH="/usr/local/opt/qt@5/bin:$PATH"
         qmake CONFIG+=release PREFIX=/usr
         make -j$(nproc)
         make INSTALL_ROOT=appdir install
@@ -29,7 +30,7 @@ jobs:
         zip -r laigter-mac.zip laigter.app
 
     - name: upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mac-artifacts
         path: laigter-mac.zip 

diff --git a/.github/workflows/laigter-windows.yaml b/.github/workflows/laigter-windows.yaml
@@ -8,15 +8,18 @@ jobs:
     steps:
 
     - name: checkout sources
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v4
       with:
-        version: '5.15.2'
-        modules: 'imageformats'
-        arch: win64_mingw81
+        aqtversion: '==3.1.*'
+        version: '6.2.0'
+        arch: 'win64_mingw81'
         extra: '--external 7z'
+        target: 'desktop'
+        host: 'windows'
+        modules: 'qtimageformats'
 
     - name: Build Laigter
       shell: cmd
@@ -30,7 +33,7 @@ jobs:
         tar.exe -a -c -f laigter-windows.zip laigter-windows
   
     - name: upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: mac-artifacts
         path: laigter-windows.zip 

diff --git a/gui/language_selector.cpp b/gui/language_selector.cpp
@@ -4,7 +4,7 @@
 #include <QTextStream>
 #include <QFile>
 #include <QStandardPaths>
-#include <QTextCodec>
+#include <QStringConverter>
 
 LanguageSelector::LanguageSelector(QWidget *parent)
     : QDialog(parent), ui(new Ui::LanguageSelector)
@@ -14,7 +14,7 @@ LanguageSelector::LanguageSelector(QWidget *parent)
   if (f.open(QIODevice::ReadOnly))
   {
     QTextStream in(&f);
-    in.setCodec( QTextCodec::codecForName( "UTF-8" ) );
+    in.setEncoding( QStringConverter::Utf8 );
     while (!in.atEnd())
     {
       QStringList line = in.readLine().split("\t");

diff --git a/gui/presets_manager.cpp b/gui/presets_manager.cpp
@@ -24,7 +24,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 #include <QStandardPaths>
-#include <QTextCodec>
+#include <QStringConverter>
 #include <QThread>
 
 static QString presetCodes[30] = {"EnhanceHeight ",
@@ -161,7 +161,7 @@ void PresetsManager::on_pushButtonSavePreset_clicked()
   if (preset.open(QIODevice::WriteOnly))
   {
     QTextStream in(&preset);
-    in.setCodec(QTextCodec::codecForName("UTF-8"));
+    in.setEncoding(QStringConverter::Utf8);
     in << "[Laigter Preset]";
     bool saveLights = false;
     QTreeWidgetItemIterator it(ui->treeWidget);
@@ -519,7 +519,7 @@ void PresetsManager::SaveAllPresets(ImageProcessor *p, QString path)
   {
     QTextStream in(&preset);
     in << "[Laigter Preset]";
-    in.setCodec(QTextCodec::codecForName("UTF-8"));
+    in.setEncoding(QStringConverter::Utf8);
     for (int i = 0; i < 30; i++)
     {
       in << "\n"