Merge remote-tracking branch 'origin/4.6'

Conflicts:
	share/qtcreator/qml-type-descriptions/qmlproject.qmltypes
	src/plugins/clangcodemodel/clangeditordocumentprocessor.cpp

Change-Id: I35fb652f29a98a798be7c8b4b4c2e581eb175fb6

src/plugins/cmakeprojectmanager/servermodereader.cpp

@@ -460,7 +460,6 @@ int ServerModeReader::calculateProgress(const int minRange, const int min, const
 void ServerModeReader::extractCodeModelData(const QVariantMap &data)
 {
     const QVariantList configs = data.value("configurations").toList();
-    QTC_CHECK(configs.count() == 1); // FIXME: Support several configurations!
     for (const QVariant &c : configs) {
         const QVariantMap &cData = c.toMap();
         extractConfigurationData(cData);
@@ -842,6 +841,11 @@ void ServerModeReader::addFileGroups(ProjectNode *targetRoot,
 {
     QList<FileNode *> toList;
     QSet<Utils::FileName> alreadyListed;
+    // Files already added by other configurations:
+    targetRoot->forEachGenericNode([&alreadyListed](const Node *n) {
+        alreadyListed.insert(n->filePath());
+    });
+
     for (const FileGroup *f : fileGroups) {
         const QList<FileName> newSources = Utils::filtered(f->sources, [&alreadyListed](const Utils::FileName &fn) {
             const int count = alreadyListed.count();