diff options
| -rw-r--r-- | src/app/app.qbs | 7 | ||||
| -rw-r--r-- | src/tools/qml2puppet/qml2puppet.qbs | 5 | ||||
| -rw-r--r-- | tests/auto/json/json.qbs | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/app/app.qbs b/src/app/app.qbs index b67ff28a2c..d0c2885c46 100644 --- a/src/app/app.qbs +++ b/src/app/app.qbs @@ -20,9 +20,10 @@ QtcProduct { targetName: qtc.ide_app_target version: qtc.qtcreator_version - installDir: bundle.isBundle ? qtc.ide_app_path : qtc.ide_bin_path - installTags: bundle.isBundle ? ["bundle.content"] : base - installSourceBase: bundle.isBundle ? buildDirectory : base + property bool isBundle: qbs.targetOS.contains("darwin") && bundle.isBundle + installDir: isBundle ? qtc.ide_app_path : qtc.ide_bin_path + installTags: isBundle ? ["bundle.content"] : base + installSourceBase: isBundle ? buildDirectory : base property bool qtcRunnable: true cpp.rpaths: qbs.targetOS.contains("macos") ? ["@executable_path/../Frameworks"] diff --git a/src/tools/qml2puppet/qml2puppet.qbs b/src/tools/qml2puppet/qml2puppet.qbs index feaa14bb6b..bb3d0726d3 100644 --- a/src/tools/qml2puppet/qml2puppet.qbs +++ b/src/tools/qml2puppet/qml2puppet.qbs @@ -20,7 +20,10 @@ QtcTool { condition: qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd") cpp.dynamicLibraries: base.concat("rt") } - bundle.embedInfoPlist: true + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.embedInfoPlist: true + } property path puppetDir: "../../../share/qtcreator/qml/qmlpuppet" cpp.includePaths: base.concat([ diff --git a/tests/auto/json/json.qbs b/tests/auto/json/json.qbs index de9a22fcf2..3b0a36e141 100644 --- a/tests/auto/json/json.qbs +++ b/tests/auto/json/json.qbs @@ -5,7 +5,7 @@ QtcAutotest { Depends { name: "bundle" } Depends { name: "qtcjson" } - bundle.isBundle: false + consoleApplication: true Group { name: "test data" |