Merge remote-tracking branch 'origin/2.8'

Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a

1 files changed, 12 insertions, 0 deletions

diff --git a/qbs/defaults.js b/qbs/defaults.js
index 12d89c9fa2..5c99f734cd 100644
--- a/qbs/defaults.js
+++ b/qbs/defaults.js
@@ -16,3 +16,15 @@ function defines(qbs)
         list.push("WITH_TESTS")
     return list
 }
+
+// see PluginSpecPrivate::loadLibrary()
+function qtLibraryName(qbs, name)
+{
+    if (qbs.debugInformation) {
+        if (qbs.targetOS.contains("windows"))
+            return name + "d";
+        else if (qbs.targetOS.contains("osx"))
+            return name + "_debug";
+    }
+    return name;
+}