aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Internally return string.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2023-02-20 19:54:35 +02:00
parent b51c028f23
commit 2733a00a40
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -182,7 +182,7 @@ macos_task_template: &MACOS_TASK_TEMPLATE
- qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6 - qbs setup-qt /opt/homebrew/opt/qt6/bin/qmake qt6
- qbs-config defaultProfile qt6 - qbs-config defaultProfile qt6
- qbs config profiles.qt6.baseProfile clang - qbs config profiles.qt6.baseProfile clang
- qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:'${MACOS_DEPLOYMENT_TARGET}' - qbs build -f valentina.qbs -d $CIRRUS_WORKING_DIR/build --command-echo-mode command-line config:release modules.buildconfig.enableUnitTests:false modules.buildconfig.enableMultiBundle:${MULTI_BUNDLE} qbs.installRoot:$CIRRUS_WORKING_DIR/build/install-root profile:qt6 project.enableConan:true project.minimumMacosVersion:${MACOS_DEPLOYMENT_TARGET}
- ccache -s - ccache -s
deploy_script: deploy_script:
- pwd - pwd

2
valentina.qbs
View File

@ -13,7 +13,7 @@ Project {
conanfilePath: project.sourceDirectory + "/conanfile.py" conanfilePath: project.sourceDirectory + "/conanfile.py"
settings: { settings: {
if (qbs.targetOS.contains("macos") && project.minimumMacosVersion !== undefined) if (qbs.targetOS.contains("macos") && project.minimumMacosVersion !== undefined)
return ({"os.version": project.minimumMacosVersion}); return ({"os.version": project.minimumMacosVersion.toString()});
return undefined; return undefined;
} }
} }