Qbs: Libraries capitalized and relocated in bin on Windows

Change-Id: I994027ef50f5f7c4ff1b2bef06d9f8db037243e4
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

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",

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' }

src/libs/QtcLibrary.qbs

@@ -0,0 +1,10 @@
+import qbs.base 1.0
+
+DynamicLibrary {
+    destination: {
+        if (qbs.targetOS === "windows")
+            return "bin"
+        else
+            return "lib"
+    }
+}

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: [
         ".",

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: [
         ".",

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",

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: [
         ".",

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: [
         ".",

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: [
         ".",

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'] }
 

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: [
         ".",

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"

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: [

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" }

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",