diff options
32 files changed, 176 insertions, 66 deletions
diff --git a/examples/code-generator/code-generator.qbs b/examples/code-generator/code-generator.qbs index f242fb61e..b9aef12b6 100644 --- a/examples/code-generator/code-generator.qbs +++ b/examples/code-generator/code-generator.qbs @@ -40,8 +40,8 @@ Project { // A code generator that outputs a "Hello World" C++ program. CppApplication { name: "hwgen" + consoleApplication: true files: ["hwgen.cpp"] - bundle.isBundle: false } // Generate and build a hello-world application. diff --git a/examples/install-bundle/install-bundle.qbs b/examples/install-bundle/install-bundle.qbs index 5659f3c72..3151f5517 100644 --- a/examples/install-bundle/install-bundle.qbs +++ b/examples/install-bundle/install-bundle.qbs @@ -8,7 +8,8 @@ Project { Depends { name: "Qt"; submodules: ["core", "gui", "widgets"] } name: "window" - targetName: bundle.isBundle ? "Window" : "window" + property bool isBundle: qbs.targetOS.contains("darwin") && bundle.isBundle + targetName: isBundle ? "Window" : "window" files: [ "main.cpp", "assetcatalog1.xcassets", @@ -19,9 +20,9 @@ Project { ] Group { - fileTagsFilter: bundle.isBundle ? ["bundle.content"] : ["application"] + fileTagsFilter: isBundle ? ["bundle.content"] : ["application"] qbs.install: true - qbs.installDir: bundle.isBundle ? "Applications" : (qbs.targetOS.contains("windows") ? "" : "bin") + qbs.installDir: isBundle ? "Applications" : (qbs.targetOS.contains("windows") ? "" : "bin") qbs.installSourceBase: product.buildDirectory } } @@ -30,13 +31,14 @@ Project { Depends { name: "cpp" } name: "coreutils" - targetName: bundle.isBundle ? "CoreUtils" : "coreutils" + property bool isBundle: qbs.targetOS.contains("darwin") && bundle.isBundle + targetName: isBundle ? "CoreUtils" : "coreutils" files: ["coreutils.cpp", "coreutils.h"] Group { - fileTagsFilter: bundle.isBundle ? ["bundle.content"] : ["dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_import"] + fileTagsFilter: isBundle ? ["bundle.content"] : ["dynamiclibrary", "dynamiclibrary_symlink", "dynamiclibrary_import"] qbs.install: true - qbs.installDir: bundle.isBundle ? "Library/Frameworks" : (qbs.targetOS.contains("windows") ? "" : "lib") + qbs.installDir: isBundle ? "Library/Frameworks" : (qbs.targetOS.contains("windows") ? "" : "lib") qbs.installSourceBase: product.buildDirectory } } diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index b459b4c8c..3b884ed5d 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -2,7 +2,6 @@ import qbs QbsProduct { Depends { name: "cpp" } - Depends { name: "bundle" } version: qbsversion.version type: Qt.core.staticBuild ? "staticlibrary" : "dynamiclibrary" targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name @@ -13,7 +12,6 @@ QbsProduct { //cpp.soVersion: version.replace(/\.\d+$/, '') cpp.visibility: "minimal" cpp.cxxLanguageVersion: "c++11" - bundle.isBundle: false property bool visibilityType: Qt.core.staticBuild ? "static" : "dynamic" property string headerInstallPrefix: "/include/qbs" Group { @@ -27,6 +25,11 @@ QbsProduct { qbs.installDir: qbsbuildconfig.importLibInstallDir } + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } + Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core"] } diff --git a/share/qbs/modules/cli/CLIModule.qbs b/share/qbs/modules/cli/CLIModule.qbs index 3b4ce8693..5c708a482 100644 --- a/share/qbs/modules/cli/CLIModule.qbs +++ b/share/qbs/modules/cli/CLIModule.qbs @@ -5,9 +5,11 @@ import qbs.ModUtils import "cli.js" as CLI Module { - Depends { name: "bundle" } - - bundle.isBundle: false + Depends { name: "bundle"; condition: qbs.targetOS.contains("darwin") } + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } condition: false diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs index 33fe36eae..2222e6a17 100644 --- a/src/app/config-ui/config-ui.qbs +++ b/src/app/config-ui/config-ui.qbs @@ -26,6 +26,8 @@ QbsApp { cpp.frameworks: ["ApplicationServices", "Cocoa"] } - Depends { name: "bundle" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } diff --git a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs index 726726337..f12a28fe6 100644 --- a/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs +++ b/tests/auto/api/testdata/app-without-sources/app-without-sources.qbs @@ -24,6 +24,7 @@ Project { CppApplication { name: "appWithoutSources" + consoleApplication: true // HACK: cpp.entryPoint currently not working 100% with gcc Properties { @@ -31,7 +32,6 @@ Project { cpp.entryPoint: "main" } cpp.entryPoint: undefined - bundle.isBundle: false Depends { name: "a" } Depends { name: "b" } diff --git a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs index 4037ae869..f52c90055 100644 --- a/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs +++ b/tests/auto/api/testdata/change-dependent-lib/change-dependent-lib.qbs @@ -18,7 +18,11 @@ Project { } Depends { name: "cpp" } cpp.defines: ["XXXX"] - bundle.isBundle: false + + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs b/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs index 6364506b4..b80af6e8a 100644 --- a/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs +++ b/tests/auto/api/testdata/disabled_install_group/disabled_install_group.qbs @@ -1,11 +1,11 @@ import qbs CppApplication { + consoleApplication: true files: "main.cpp" Group { condition: false qbs.install: true fileTagsFilter: product.type } - bundle.isBundle: false } diff --git a/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs b/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs index 2dffc2803..30f1868cb 100644 --- a/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs +++ b/tests/auto/api/testdata/export-item-with-group/export-item-with-group.qbs @@ -11,7 +11,7 @@ Project { Application { name: "app" - bundle.isBundle: false + consoleApplication: true Depends { name: "dep" } } } diff --git a/tests/auto/api/testdata/export-simple/export-simple.qbs b/tests/auto/api/testdata/export-simple/export-simple.qbs index 6eca71e89..d07bb0d1a 100644 --- a/tests/auto/api/testdata/export-simple/export-simple.qbs +++ b/tests/auto/api/testdata/export-simple/export-simple.qbs @@ -44,7 +44,10 @@ Project { files : [ "lib1.cpp" ] } Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/api/testdata/is-runnable/is-runnable.qbs b/tests/auto/api/testdata/is-runnable/is-runnable.qbs index 47e217a6a..2883328ed 100644 --- a/tests/auto/api/testdata/is-runnable/is-runnable.qbs +++ b/tests/auto/api/testdata/is-runnable/is-runnable.qbs @@ -6,6 +6,9 @@ Project { } DynamicLibrary { name: "lib" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs index 2020752e6..8fec45700 100644 --- a/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs-staticlibs/link-dynamiclibs-staticlibs.qbs @@ -13,7 +13,10 @@ Project { files : [ "dynamic1.cpp" ] Depends { name: "cpp" } Depends { name: "static1" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } StaticLibrary { @@ -29,7 +32,10 @@ Project { Depends { name: "cpp" } Depends { name: "static2" } cpp.visibility: 'hidden' - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } StaticLibrary { diff --git a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs index e0f1fc553..d6047060c 100644 --- a/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-dynamiclibs/link-dynamiclibs.qbs @@ -18,7 +18,10 @@ Project { } Depends { name: "cpp" } Depends { name: "lib2" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } DynamicLibrary { @@ -29,7 +32,10 @@ Project { } Depends { name: "cpp" } Depends { name: "lib3" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } DynamicLibrary { @@ -39,7 +45,10 @@ Project { files : [ "lib3.cpp" ] } Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } DynamicLibrary { @@ -50,7 +59,10 @@ Project { files : [ "lib4.h", "lib4.cpp" ] } Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } Export { Depends { name: "cpp" } diff --git a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs index 6704a9188..eafa764ba 100644 --- a/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs +++ b/tests/auto/api/testdata/link-staticlibs-dynamiclibs/link-staticlibs-dynamiclibs.qbs @@ -20,7 +20,10 @@ Project { files : [ "dynamic1.cpp" ] Depends { name: "cpp" } Depends { name: "static2" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } StaticLibrary { @@ -35,7 +38,10 @@ Project { files: [ "dynamic2.cpp" ] Depends { name: "cpp" } cpp.visibility: 'hidden' - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs index 2695a8085..8b50cce2a 100644 --- a/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs +++ b/tests/auto/api/testdata/new-output-artifact-in-dependency/new-output-artifact-in-dependency.qbs @@ -5,7 +5,10 @@ Project { //Depends { name: "cpp" } name: "lib" files: "lib.cpp" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } CppApplication { diff --git a/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs b/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs index f0cf5813c..5e3427793 100644 --- a/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs +++ b/tests/auto/api/testdata/productNameWithDots/productNameWithDots.qbs @@ -1,13 +1,10 @@ import qbs Project { - Product { - Depends { name: "cpp" } - Depends { name: "bundle" } - type: ["application"] + CppApplication { name: "myapp" + consoleApplication: true Depends { name: "foo.bar.bla" } files: ["app.cpp"] - bundle.isBundle: false } StaticLibrary { Depends { name: "cpp" } diff --git a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs index 834c386ad..204711625 100644 --- a/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs +++ b/tests/auto/api/testdata/qt5-plugin/qt5-plugin.qbs @@ -7,7 +7,10 @@ DynamicLibrary { Depends { name: "Qt.core" } Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } Group { condition: Qt.core.versionMajor >= 5 diff --git a/tests/auto/api/testdata/rename-product/rename.qbs b/tests/auto/api/testdata/rename-product/rename.qbs index 137de27a7..18eb5ee6c 100644 --- a/tests/auto/api/testdata/rename-product/rename.qbs +++ b/tests/auto/api/testdata/rename-product/rename.qbs @@ -12,6 +12,9 @@ Project { Depends { name: "cpp" } cpp.defines: "MY_EXPORT=EXPORT" files: "lib.cpp" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/api/testdata/rename-target-artifact/rename.qbs b/tests/auto/api/testdata/rename-target-artifact/rename.qbs index 27f91841a..a3e811c29 100644 --- a/tests/auto/api/testdata/rename-target-artifact/rename.qbs +++ b/tests/auto/api/testdata/rename-target-artifact/rename.qbs @@ -13,6 +13,9 @@ Project { Depends { name: "cpp" } cpp.defines: "MY_EXPORT=EXPORT" files: "lib.cpp" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/blackbox/testdata-java/java/vehicles.qbs b/tests/auto/blackbox/testdata-java/java/vehicles.qbs index 2e048c634..56a5f3d37 100644 --- a/tests/auto/blackbox/testdata-java/java/vehicles.qbs +++ b/tests/auto/blackbox/testdata-java/java/vehicles.qbs @@ -5,7 +5,10 @@ Project { DynamicLibrary { Depends { name: "cpp" } Depends { name: "car_jar" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } name: "native" files: ["engine.c"] diff --git a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs index 0d623a739..b91b8799e 100644 --- a/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs +++ b/tests/auto/blackbox/testdata-qt/plugin-meta-data/plugin-meta-data.qbs @@ -24,7 +24,10 @@ Project { Depends { name: "cpp" } Depends { name: "Qt.core" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } cpp.defines: [Qt.core.staticBuild ? "QT_STATICPLUGIN" : "QT_PLUGIN"] cpp.cxxLanguageVersion: "c++11" cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined diff --git a/tests/auto/blackbox/testdata/assembly/assembly.qbs b/tests/auto/blackbox/testdata/assembly/assembly.qbs index 39ecc021c..7dd82731a 100644 --- a/tests/auto/blackbox/testdata/assembly/assembly.qbs +++ b/tests/auto/blackbox/testdata/assembly/assembly.qbs @@ -32,21 +32,30 @@ Project { files : [ "testa.s" ] Depends { name: "cpp" } condition: qbs.toolchain.contains("gcc") - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } StaticLibrary { name : "testb" files : [ "testb.S" ] Depends { name: "cpp" } condition: qbs.toolchain.contains("gcc") - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } StaticLibrary { name : "testc" files : [ "testc.sx" ] Depends { name: "cpp" } condition: qbs.toolchain.contains("gcc") - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } StaticLibrary { name: "testd" @@ -57,7 +66,10 @@ Project { Depends { name: "cpp" } condition: qbs.toolchain.contains("msvc") && (qbs.architecture === "x86" || qbs.architecture === "x86_64") - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } } diff --git a/tests/auto/blackbox/testdata/clean/clean.qbs b/tests/auto/blackbox/testdata/clean/clean.qbs index 8221d0544..28ebe91f0 100644 --- a/tests/auto/blackbox/testdata/clean/clean.qbs +++ b/tests/auto/blackbox/testdata/clean/clean.qbs @@ -6,7 +6,10 @@ Project { version: "1.1.0" name: "dep" files: "dep.cpp" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } CppApplication { diff --git a/tests/auto/blackbox/testdata/command-file/command-file.qbs b/tests/auto/blackbox/testdata/command-file/command-file.qbs index fb4943fb0..fb46a0712 100644 --- a/tests/auto/blackbox/testdata/command-file/command-file.qbs +++ b/tests/auto/blackbox/testdata/command-file/command-file.qbs @@ -5,7 +5,10 @@ Project { name: "theLib" destinationDirectory: project.buildDirectory Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } files: ["lib.cpp"] } CppApplication { diff --git a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs index ff40604b4..5b9e12ebb 100644 --- a/tests/auto/blackbox/testdata/external-libs/external-libs.qbs +++ b/tests/auto/blackbox/testdata/external-libs/external-libs.qbs @@ -7,7 +7,10 @@ Project { name: "lib1" destinationDirectory: project.libDir Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } files: ["lib1.cpp"] } StaticLibrary { @@ -15,7 +18,10 @@ Project { destinationDirectory: project.libDir Depends { name: "cpp" } Depends { name: "lib1" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } files: ["lib2.cpp"] } // TODO: Remove once we have parameterized dependencies diff --git a/tests/auto/blackbox/testdata/ld/ld.qbs b/tests/auto/blackbox/testdata/ld/ld.qbs index d19603511..f95157012 100644 --- a/tests/auto/blackbox/testdata/ld/ld.qbs +++ b/tests/auto/blackbox/testdata/ld/ld.qbs @@ -6,10 +6,9 @@ Project { name: "coreutils" targetName: "qbs can handle any file paths, even the crazy ones! ;)" files: ["coreutils.cpp", "coreutils.h"] - bundle.isBundle: false - Properties { condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false cpp.sonamePrefix: "@rpath" } diff --git a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs index a3327454d..44d0cec37 100644 --- a/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs +++ b/tests/auto/blackbox/testdata/loadablemodule/loadablemodule.qbs @@ -3,8 +3,10 @@ import qbs Project { LoadableModule { Depends { name: "cpp" } - Depends { name: "bundle" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } name: "CoolPlugIn" files: ["exported.cpp", "exported.h"] @@ -17,8 +19,7 @@ Project { CppApplication { Depends { name: "cpp" } Depends { name: "CoolPlugIn"; cpp.link: false } - Depends { name: "bundle" } - bundle.isBundle: false + consoleApplication: true name: "CoolApp" files: ["main.cpp"] diff --git a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs index 16c68064e..b26b0f31f 100644 --- a/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs +++ b/tests/auto/blackbox/testdata/overrideProjectProperties/helper_lib.qbs @@ -4,5 +4,8 @@ DynamicLibrary { name: "helperLib" files: "helperlib.cpp" Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } diff --git a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs index ebfc45d3f..d6cba15dd 100644 --- a/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs +++ b/tests/auto/blackbox/testdata/product-dependencies-by-type/product-dependencies-by-type.qbs @@ -29,7 +29,10 @@ Project { Depends { name: "cpp" } name: "lib-product" files: "main.cpp" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } CppApplication { diff --git a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs index 5574c5fb4..da9a862c5 100644 --- a/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs +++ b/tests/auto/blackbox/testdata/propertyChanges/propertyChanges.qbs @@ -27,7 +27,10 @@ Project { Depends { name: "cpp" } name: "library" files: "lib.cpp" - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } Product { diff --git a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs index 1ecbe0f36..b28d7b822 100644 --- a/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs +++ b/tests/auto/blackbox/testdata/separate-debug-info/separate-debug-info.qbs @@ -77,7 +77,7 @@ Project { name: "app4" type: ["application"] files: ["main.cpp"] - bundle.isBundle: false + consoleApplication: true cpp.separateDebugInformation: true } DynamicLibrary { @@ -85,14 +85,20 @@ Project { name: "foo4" type: ["dynamiclibrary"] files: ["foo.cpp"] - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } cpp.separateDebugInformation: true } LoadableModule { Depends { name: "cpp" } name: "bar4" files: ["foo.cpp"] - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } cpp.separateDebugInformation: true } @@ -100,7 +106,10 @@ Project { name: "app5" type: ["application"] files: ["main.cpp"] - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } cpp.separateDebugInformation: true Properties { condition: qbs.targetOS.contains("darwin") @@ -112,7 +121,10 @@ Project { name: "foo5" type: ["dynamiclibrary"] files: ["foo.cpp"] - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } cpp.separateDebugInformation: true Properties { condition: qbs.targetOS.contains("darwin") @@ -123,7 +135,10 @@ Project { Depends { name: "cpp" } name: "bar5" files: ["foo.cpp"] - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } cpp.separateDebugInformation: true Properties { condition: qbs.targetOS.contains("darwin") diff --git a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs index 95adaa4ba..a95d6015e 100644 --- a/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs +++ b/tests/auto/blackbox/testdata/symbolLinkMode/symbolLinkMode.qbs @@ -39,11 +39,13 @@ Project { } DynamicLibrary { - Depends { name: "bundle" } Depends { name: "cpp" } Depends { name: "indirect"; cpp.symbolLinkMode: "reexport" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } name: "functions" files: ["lib.cpp"] cpp.cxxLanguageVersion: "c++11" @@ -80,10 +82,12 @@ Project { } DynamicLibrary { - Depends { name: "bundle" } Depends { name: "cpp" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } name: "indirect" files: ["indirect.cpp"] cpp.cxxLanguageVersion: "c++11" |