Merge remote-tracking branch 'origin/4.12'

Conflicts:
	src/plugins/qmldesigner/designmodewidget.cpp

Change-Id: I94a94a15df433d6caa8922fccaa69918b5e4e365

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -886,7 +886,9 @@ static RawProjectParts generateProjectParts(
             rpp.setFlagsForC({cToolChain.get(), cFlags});
             rpp.setFlagsForCxx({cxxToolChain.get(), cxxFlags});
 
-            rpp.setMacros(transform<QVector>(arrayToStringList(props.value("cpp.defines")),
+            const QStringList defines = arrayToStringList(props.value("cpp.defines"))
+                    + arrayToStringList(props.value("cpp.platformDefines"));
+            rpp.setMacros(transform<QVector>(defines,
                     [](const QString &s) { return Macro::fromKeyValue(s); }));
 
             ProjectExplorer::HeaderPaths grpHeaderPaths;

src/plugins/qbsprojectmanager/qbssession.cpp

@@ -392,6 +392,7 @@ void QbsSession::insertRequestedModuleProperties(QJsonObject &request)
         "cpp.minimumDarwinVersionCompilerFlag",
         "cpp.platformCommonCompilerFlags",
         "cpp.platformDriverFlags",
+        "cpp.platformDefines",
         "cpp.positionIndependentCode",
         "cpp.systemFrameworkPaths",
         "cpp.systemIncludePaths",