Skip to content

Commit 0f867d4

Browse files
authored
Merge pull request #7754 from nextcloud/Rello-patch-1
Make Brander QT selection dynamic
2 parents c6b1a0d + b6d3ecb commit 0f867d4

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

VERSION.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,5 @@ if( MIRALL_VERSION_BUILD )
3838
set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" )
3939
endif( MIRALL_VERSION_BUILD )
4040

41+
# not used anymore. For brander, please maintain craftmaster.ini
4142
set(QT_MAJOR_VERSION 6)

craftmaster.ini

+4
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,7 @@ Paths/Python = /Users/runner/hostedtoolcache/Python/3.12.3/arm64
5858
[Env]
5959
CRAFT_CODESIGN_CERTIFICATE =
6060
SIGN_PACKAGE = False
61+
62+
[Custom_Variables_for_Brander]
63+
qtPath = /opt/qt
64+
dockerImage = ghcr.io/nextcloud/continuous-integration-client-appimage-qt6:client-appimage-6.8.1-1

0 commit comments

Comments
 (0)