Merge remote-tracking branch 'origin/2.5'

Conflicts: src/libs/symbianutils/symbianutils.qbs src/libs/utils/utils.qbs src/libs/zeroconf/zeroconf.qbs Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
2012-03-29 17:58:34 +02:00
parent 2a74097b54 c9bd695a90
commit 63244127a8
19 changed files with 98 additions and 50 deletions
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -24,9 +24,9 @@ QtcPlugin {
         buildDirectory
    ]

-    cpp.staticLibraries: {
+    cpp.dynamicLibraries: {
        if (qbs.targetOS == 'windows') return [
-            "ole32.lib"
+            "ole32"
        ]
    }