Merge remote-tracking branch 'origin/4.10'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/libs/utils/synchronousprocess.cpp
	src/plugins/baremetal/iarewtoolchain.cpp
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	tests/unit/unittest/CMakeLists.txt

Change-Id: I124ad492df403286751e175d27fe36487ddf6d07

src/plugins/ios/iosprobe.cpp

@@ -25,6 +25,7 @@
 
 #include "iosprobe.h"
 
+#include <utils/algorithm.h>
 #include <utils/synchronousprocess.h>
 
 #include <QDir>
@@ -120,7 +121,7 @@ void XcodeProbe::setupDefaultToolchains(const QString &devPath)
         const QFileInfo sdkPathInfo(sdk.path.toString());
         if (sdkPathInfo.exists() && sdkPathInfo.isDir()) {
             clangProfile.sdks.push_back(sdk);
-            allArchitectures += sdk.architectures.toSet();
+            allArchitectures += Utils::toSet(sdk.architectures);
         }
     }