Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d

1 files changed, 2 insertions, 1 deletions

diff --git a/qtcreator.qbs b/qtcreator.qbs
index c851330ddd..4648db53f1 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -45,6 +45,7 @@ Project {
         "src/plugins/debugger/debugger.qbs",
         "src/plugins/debugger/ptracepreload.qbs",
         "src/plugins/designer/designer.qbs",
+        "src/plugins/diffeditor/diffeditor.qbs",
         "src/plugins/fakevim/fakevim.qbs",
         "src/plugins/find/find.qbs",
         "src/plugins/genericprojectmanager/genericprojectmanager.qbs",
@@ -109,7 +110,7 @@ Project {
                 cmd.ide_version_major = product.ide_version_major;
                 cmd.ide_version_minor = product.ide_version_minor;
                 cmd.ide_version_release = product.ide_version_release;
-                cmd.onWindows = (product.modules.qbs.targetOS == "windows");
+                cmd.onWindows = (product.moduleProperty("qbs", "targetOS") === "windows");
                 cmd.sourceCode = function() {
                     var file = new TextFile(input.fileName);
                     var content = file.readAll();