feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SdkTool: Fix qbs release build with auto tests

Browse Source 
Change-Id: I42777d24f96186d099a30f9da8ac99b0b1bcba4f
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2022-07-12 08:15:58 +02:00
committed by Christian Kandeler
parent 34213f5717
commit dd39d07cd3
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/tools/sdktool/sdktoollib.qbs
View File

@@ -11,13 +11,18 @@ QtcLibrary {
property string libsDir: path + "/../../libs" property string libsDir: path + "/../../libs"
cpp.defines: base.concat([ cpp.defines: {
"UTILS_LIBRARY", var defines = base;
qbs.targetOS.contains("macos") base.push(
? 'DATA_PATH="."' "UTILS_LIBRARY",
: qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"' qbs.targetOS.contains("macos")
: 'DATA_PATH="../../share/qtcreator"' ? 'DATA_PATH="."'
]) : qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"'
: 'DATA_PATH="../../share/qtcreator"');
if (project.withAutotests)
defines.push("WITH_TESTS");
return defines;
}
cpp.dynamicLibraries: { cpp.dynamicLibraries: {
if (qbs.targetOS.contains("windows")) if (qbs.targetOS.contains("windows"))
return ["user32", "shell32"] return ["user32", "shell32"]