Attempt to update autobuild machinery for Qt6

xaos-project · Sep 29, 2023 · 6063fda · 6063fda
1 parent de1e501
commit 6063fda
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: prerequisites
-      run: sudo apt update && sudo apt install build-essential qttools5-dev-tools qt5-default
+      run: sudo apt update && sudo apt install build-essential qttools5-dev-tools qt6-base-dev libgl1-mesa-dev
     - name: qmake
       run: qmake
     - name: make

diff --git a/XaoS.pro b/XaoS.pro
@@ -3,7 +3,9 @@
 # -------------------------------------------------
 
 lessThan(QT_MAJOR_VERSION, 6): error("requires Qt >= 6")
+wasm {
 lessThan(QT_MINOR_VERSION, 5): error("requires Qt >= 6.5.2")
+}
 
 TEMPLATE = app
 
@@ -49,6 +51,7 @@ isEmpty(QMAKE_LRELEASE) {
     }
     unix {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
+        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
     } else {
         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
     }