Build AppImage with qt6

.gitlab-ci.yml

@@ -41,17 +41,10 @@ variables:
 before_script:
  - echo "started by ${GITLAB_USER_NAME}"
 
-#reusable templates
-.ccache_init: &ccache_init
-  before_script:
-    - export QT_SELECT=qt5
-    - export APPIMAGE_EXTRACT_AND_RUN=1
-
 #-----------------------------------------------------------------------#
 # Supported Devices Build Target                                        #
 #-----------------------------------------------------------------------#
 "Supported Devices":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
   tags:
   - linux
@@ -75,7 +68,6 @@ before_script:
 # Linux (AppImage) i386 Build Target                                    #
 #-----------------------------------------------------------------------#
 "Linux i386 AppImage":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
   tags:
   - linux
@@ -96,11 +88,34 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 i386 Build Target                                #
+#-----------------------------------------------------------------------#
+"Linux i386 AppImage Qt6":
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
+  tags:
+  - linux
+  - i386
+  stage: build
+  script:
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_i386_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-i386.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) amd64 Build Target                                   #
 #-----------------------------------------------------------------------#
 "Linux amd64 AppImage Base":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
   stage: build
   script:
@@ -134,11 +149,34 @@ before_script:
   tags:
   - "saas-linux-small-amd64"
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 amd64 Build Target                               #
+#-----------------------------------------------------------------------#
+"Linux amd64 AppImage Qt6":
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
+  tags:
+  - linux
+  - amd64
+  stage: build
+  script:
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_amd64_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-amd64.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) armhf Build Target                                   #
 #-----------------------------------------------------------------------#
 "Linux armhf AppImage":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
   tags:
   - linux
@@ -159,11 +197,34 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 armhf Build Target                               #
+#-----------------------------------------------------------------------#
+"Linux armhf AppImage Qt6":
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
+  tags:
+  - linux
+  - armhf
+  stage: build
+  script:
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_armhf_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-armhf.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (AppImage) arm64 Build Target                                   #
 #-----------------------------------------------------------------------#
 "Linux arm64 AppImage":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
   tags:
   - linux
@@ -184,11 +245,34 @@ before_script:
   rules:
     - !reference [.upstream_rules, rules]
 
+#-----------------------------------------------------------------------#
+# Linux (AppImage) Qt6 arm64 Build Target                               #
+#-----------------------------------------------------------------------#
+"Linux arm64 AppImage Qt6":
+  image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
+  tags:
+  - linux
+  - arm64
+  stage: build
+  script:
+  - export $(dpkg-architecture)
+  - ./scripts/build-appimage.sh qt6
+
+  artifacts:
+    name: "${CI_PROJECT_NAME}_Linux_arm64_Qt6_${CI_COMMIT_SHORT_SHA}"
+    paths:
+    - OpenRGB-arm64.AppImage
+    - 60-openrgb.rules
+    - README.md
+    expire_in: 30 days
+
+  rules:
+    - !reference [.upstream_rules, rules]
+
 #-----------------------------------------------------------------------#
 # Linux (.deb) Debian Bookworm i386 Build Target                        #
 #-----------------------------------------------------------------------#
 "Linux i386 .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-i386
   tags:
   - linux
@@ -216,7 +300,6 @@ before_script:
 # Linux (.deb) Debian Bookworm amd64 Build Target                       #
 #-----------------------------------------------------------------------#
 "Linux amd64 .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-amd64
   tags:
   - linux
@@ -244,7 +327,6 @@ before_script:
 # Linux (.deb) Debian Bookworm armhf Build Target                       #
 #-----------------------------------------------------------------------#
 "Linux armhf .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-armhf
   tags:
   - linux
@@ -272,7 +354,6 @@ before_script:
 # Linux (.deb) Debian Bookworm arm64 Build Target                       #
 #-----------------------------------------------------------------------#
 "Linux arm64 .deb (Debian Bookworm)":
-  <<: *ccache_init
   image: registry.gitlab.com/openrgbdevelopers/openrgb-linux-ci-deb-builder:bookworm-arm64
   tags:
   - linux

OpenRGB.pro

@@ -65,6 +65,7 @@ message("VERSION_DEB: "$$VERSION_DEB)
 message("VERSION_WIX: "$$VERSION_WIX)
 message("VERSION_AUR: "$$VERSION_AUR)
 message("VERSION_RPM: "$$VERSION_RPM)
+message("QT_VERSION:  "$$QT_VERSION)
 #-----------------------------------------------------------------------------------------------#
 # Automatically generated build information                                                     #
 #-----------------------------------------------------------------------------------------------#

qt/OpenRGBDialog/OpenRGBDialog.cpp

@@ -1641,7 +1641,7 @@ void OpenRGBDialog::onShowDialogMessage()
 
     DontShowAgain = false;
 
-    #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+    #if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
         QObject::connect(CheckBox_DontShowAgain, &QCheckBox::checkStateChanged, [this](Qt::CheckState state)
     #else
         QObject::connect(CheckBox_DontShowAgain, &QCheckBox::stateChanged, [this](int state)

scripts/build-appimage.sh

@@ -15,6 +15,23 @@ set -e
 TEMP_BASE=/tmp
 BUILD_DIR=$(mktemp -d -p "$TEMP_BASE" appimage-build-XXXXXX)
 
+#-----------------------------------------------------------------------#
+# Setup environment                                                     #
+#-----------------------------------------------------------------------#
+export APPIMAGE_EXTRACT_AND_RUN=1
+
+if [ "$1" = "qt6" ]; then
+    export QT_SELECT=qt6
+else
+    export QT_SELECT=qt5
+fi
+
+if [ "$QT_SELECT" = "qt6" ]; then
+    export QMAKE=qmake6
+else
+    export QMAKE=qmake
+fi
+
 #-----------------------------------------------------------------------#
 # This checks the Architecture of the system to work out if we're       #
 #     building on i386 or x86_64 and saves for later use                #
@@ -67,7 +84,7 @@ pushd "$BUILD_DIR"
 # we need to explicitly set the install prefix, as qmake's default is   #
 # /usr/local for some reason...                                         #
 #-----------------------------------------------------------------------#
-qmake "$REPO_ROOT"
+$QMAKE "$REPO_ROOT"
 
 #-----------------------------------------------------------------------#
 # Build project and install files into AppDir                           #