Commit df94a960 authored by Eike Ziller's avatar Eike Ziller

Fix build on Windows and macOS/Qbs

Task-number: QTCREATORBUG-18805
Change-Id: Ic178a2f8bf167a8e0c683e055b22211e52f18395
Reviewed-by: default avatarRobert Loehning <robert.loehning@qt.io>
parent 664ab2c4
......@@ -5,6 +5,8 @@ QT -= concurrent gui widgets testlib
isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/../../shared/qtcreator_pch.h
UTILS = $$PWD/../../libs/utils
DEFINES += UTILS_LIBRARY
win32: LIBS += -luser32 -lshell32
SOURCES += \
main.cpp \
......
......@@ -6,10 +6,21 @@ QtcTool {
Depends { name: "Qt.core" }
Depends { name: "app_version_header" }
cpp.defines: base.concat([qbs.targetOS.contains("macos")
cpp.defines: base.concat([
"UTILS_LIBRARY",
qbs.targetOS.contains("macos")
? 'DATA_PATH="."'
: qbs.targetOS.contains("windows") ? 'DATA_PATH="../share/qtcreator"'
: 'DATA_PATH="../../share/qtcreator"'])
: 'DATA_PATH="../../share/qtcreator"'
])
cpp.dynamicLibraries: {
if (qbs.targetOS.contains("windows"))
return ["user32", "shell32"]
}
Properties {
condition: qbs.targetOS.contains("macos")
cpp.frameworks: ["Foundation"]
}
files: [
"addcmakeoperation.cpp", "addcmakeoperation.h",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment