Merge pull request #7754 from nextcloud/Rello-patch-1

Make Brander QT selection dynamic
nextcloud · Jan 22, 2025 · 0f867d4 · 0f867d4
2 parents c6b1a0d + b6d3ecb
commit 0f867d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -38,4 +38,5 @@ if( MIRALL_VERSION_BUILD )
     set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
 endif( MIRALL_VERSION_BUILD )
 
+# not used anymore. For brander, please maintain craftmaster.ini
 set(QT_MAJOR_VERSION 6)
diff --git a/craftmaster.ini b/craftmaster.ini
@@ -58,3 +58,7 @@ Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64
 [Env]
 CRAFT_CODESIGN_CERTIFICATE =
 SIGN_PACKAGE = False
+
+[Custom_Variables_for_Brander]
+qtPath = /opt/qt
+dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.8.1-1