Merge remote-tracking branch 'origin/4.0'

Conflicts:
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp

Change-Id: I6ae2d37290643d69390f679a54f7596782f3d97f

src/plugins/cpptools/projectpart.h

@@ -103,6 +103,7 @@ public: // fields
     QByteArray projectDefines;
     QByteArray toolchainDefines;
     Core::Id toolchainType;
+    QString targetTriple;
     ProjectPartHeaderPaths headerPaths;
     QStringList precompiledHeaders;
     LanguageVersion languageVersion;