diff --git a/qtcreator.qbp b/qtcreator.qbp index 46c7801609a..8e91007aa0d 100644 --- a/qtcreator.qbp +++ b/qtcreator.qbp @@ -136,8 +136,8 @@ Project { Depends { name: "app_version_header" } Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["gui", "network"] } - Depends { name: "utils" } - Depends { name: "extensionsystem" } + Depends { name: "Utils" } + Depends { name: "ExtensionSystem" } files: [ "src/app/main.cpp", diff --git a/src/libs/3rdparty/botan/botan.qbs b/src/libs/3rdparty/botan/botan.qbs index 7fe9388e8c3..a41a3fee688 100644 --- a/src/libs/3rdparty/botan/botan.qbs +++ b/src/libs/3rdparty/botan/botan.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { - name: "botan" - destination: "lib" +QtcLibrary { + name: "Botan" Depends { name: "cpp" } Depends { name: "qt"; submodules: 'core' } diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs new file mode 100644 index 00000000000..f2116d77d63 --- /dev/null +++ b/src/libs/QtcLibrary.qbs @@ -0,0 +1,10 @@ +import qbs.base 1.0 + +DynamicLibrary { + destination: { + if (qbs.targetOS === "windows") + return "bin" + else + return "lib" + } +} diff --git a/src/libs/aggregation/aggregation.qbs b/src/libs/aggregation/aggregation.qbs index 6e254144f76..ac34d281dbe 100644 --- a/src/libs/aggregation/aggregation.qbs +++ b/src/libs/aggregation/aggregation.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { - name: "aggregation" - destination: "lib" +QtcLibrary { + name: "Aggregation" cpp.includePaths: [ ".", diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs index 705cbfabc73..a1dbf427485 100644 --- a/src/libs/cplusplus/cplusplus.qbs +++ b/src/libs/cplusplus/cplusplus.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "CPlusPlus" - destination: "lib" cpp.includePaths: [ ".", diff --git a/src/libs/extensionsystem/extensionsystem.qbs b/src/libs/extensionsystem/extensionsystem.qbs index dd87667eec7..13125b66510 100644 --- a/src/libs/extensionsystem/extensionsystem.qbs +++ b/src/libs/extensionsystem/extensionsystem.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { - name: "extensionsystem" - destination: "lib" +QtcLibrary { + name: "ExtensionSystem" cpp.includePaths: [ ".", @@ -15,7 +15,7 @@ DynamicLibrary { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core", "gui"] } - Depends { name: "aggregation" } + Depends { name: "Aggregation" } files: [ "plugindetailsview.ui", diff --git a/src/libs/glsl/glsl.qbs b/src/libs/glsl/glsl.qbs index e208cf7b8db..75e39267091 100644 --- a/src/libs/glsl/glsl.qbs +++ b/src/libs/glsl/glsl.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "GLSL" - destination: "lib" cpp.includePaths: [ ".", diff --git a/src/libs/languageutils/languageutils.qbs b/src/libs/languageutils/languageutils.qbs index fa267951808..4ac659b6304 100644 --- a/src/libs/languageutils/languageutils.qbs +++ b/src/libs/languageutils/languageutils.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "LanguageUtils" - destination: "lib" cpp.includePaths: [ ".", diff --git a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs index 55a7d8ce8c8..bf8b1dec83f 100644 --- a/src/libs/qmleditorwidgets/qmleditorwidgets.qbs +++ b/src/libs/qmleditorwidgets/qmleditorwidgets.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "QmlEditorWidgets" - destination: "lib" cpp.includePaths: [ ".", diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs index 518b6bac13f..46d6865171e 100644 --- a/src/libs/qmljs/qmljs.qbs +++ b/src/libs/qmljs/qmljs.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "QmlJS" - destination: "lib" cpp.includePaths: [ ".", @@ -15,8 +15,8 @@ DynamicLibrary { ] cpp.optimization: "fast" - Depends { name: "utils" } - Depends { name: "languageutils" } + Depends { name: "Utils" } + Depends { name: "LanguageUtils" } Depends { name: "cpp" } Depends { name: "Qt"; submodules: ['gui', 'script'] } diff --git a/src/libs/qmljsdebugclient/qmljsdebugclient.qbs b/src/libs/qmljsdebugclient/qmljsdebugclient.qbs index a975195e444..9ca80f21af1 100644 --- a/src/libs/qmljsdebugclient/qmljsdebugclient.qbs +++ b/src/libs/qmljsdebugclient/qmljsdebugclient.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "QmlJSDebugClient" - destination: "lib" cpp.includePaths: [ ".", diff --git a/src/libs/symbianutils/symbianutils.qbs b/src/libs/symbianutils/symbianutils.qbs index 7d1b0145913..f9fadceb845 100644 --- a/src/libs/symbianutils/symbianutils.qbs +++ b/src/libs/symbianutils/symbianutils.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "symbianutils" - destination: "lib" cpp.includePaths: [ ".", @@ -19,7 +19,7 @@ DynamicLibrary { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["network"]} - Depends { name: "utils" } + Depends { name: "Utils" } Group { condition: qbs.targetOS == "linux" || qbs.targetOS == "mac" diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 3f1b28139cc..31165a7d614 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { - name: "utils" - destination: "lib" +QtcLibrary { + name: "Utils" cpp.defines: [ "QTCREATOR_UTILS_LIB" ] cpp.includePaths: [ ".", "..", @@ -19,7 +19,7 @@ DynamicLibrary { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ['gui', 'network', 'script'] } - Depends { name: "botan" } + Depends { name: "Botan" } Depends { name: "app_version_header" } files: [ diff --git a/src/libs/zeroconf/zeroconf.qbs b/src/libs/zeroconf/zeroconf.qbs index 8fadbb2672d..17bf4d2cea8 100644 --- a/src/libs/zeroconf/zeroconf.qbs +++ b/src/libs/zeroconf/zeroconf.qbs @@ -1,8 +1,8 @@ import qbs.base 1.0 +import "../QtcLibrary.qbs" as QtcLibrary -DynamicLibrary { +QtcLibrary { name: "zeroconf" - destination: "lib" Depends { name: "cpp" } Depends { name: "Qt.network" } diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs index 1b4c9c3edd5..53dde483473 100644 --- a/src/plugins/coreplugin/coreplugin.qbs +++ b/src/plugins/coreplugin/coreplugin.qbs @@ -5,10 +5,9 @@ QtcPlugin { name: "Core" Depends { name: "qt"; submodules: ['core', 'gui', 'xml', 'network', 'script', 'sql', 'help'] } - Depends { name: "utils" } - Depends { name: "extensionsystem" } - Depends { name: "aggregation" } - Depends { name: "pluginspec" } + Depends { name: "Utils" } + Depends { name: "ExtensionSystem" } + Depends { name: "Aggregation" } cpp.includePaths: [ ".", @@ -242,9 +241,9 @@ QtcPlugin { } ProductModule { - Depends { name: "aggregation" } - Depends { name: "extensionsystem" } - Depends { name: "utils" } + Depends { name: "Aggregation" } + Depends { name: "ExtensionSystem" } + Depends { name: "Utils" } cpp.includePaths: [ "../..", "../../libs",