CppTools: Ensure that the C++ project part is the first one

...for a given file in the ambiguous case (CppModelManager::projectPart).

There are several places where the first one will be preferred if there
are multiple project parts associated with a project file.

Change-Id: Ic01ea06277bc10f872238dcc181a55532b5783be
Reviewed-by: David Schulz <david.schulz@qt.io>

1 files changed, 14 insertions, 14 deletions

diff --git a/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp b/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
index 2171b9adbf..23e57cb8cf 100644
--- a/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
+++ b/src/plugins/cpptools/cppbaseprojectpartbuilder.cpp
@@ -132,20 +132,6 @@ QList<Core::Id> BaseProjectPartBuilder::createProjectPartsForFiles(const QString
         // The ProjextExplorer does not distinguish between other versions than C++ and QML.
         languages += ProjectExplorer::Constants::LANG_CXX;
 
-        if (cat.hasCSources()) {
-            createProjectPart(cat.cSources(),
-                              cat.partName("C"),
-                              ProjectPart::LatestCVersion,
-                              ProjectPart::NoExtensions);
-        }
-
-        if (cat.hasObjcSources()) {
-            createProjectPart(cat.objcSources(),
-                              cat.partName("Obj-C"),
-                              ProjectPart::LatestCVersion,
-                              ProjectPart::ObjectiveCExtensions);
-        }
-
         if (cat.hasCxxSources()) {
             createProjectPart(cat.cxxSources(),
                               cat.partName("C++"),
@@ -159,6 +145,20 @@ QList<Core::Id> BaseProjectPartBuilder::createProjectPartsForFiles(const QString
                               ProjectPart::LatestCxxVersion,
                               ProjectPart::ObjectiveCExtensions);
         }
+
+        if (cat.hasCSources()) {
+            createProjectPart(cat.cSources(),
+                              cat.partName("C"),
+                              ProjectPart::LatestCVersion,
+                              ProjectPart::NoExtensions);
+        }
+
+        if (cat.hasObjcSources()) {
+            createProjectPart(cat.objcSources(),
+                              cat.partName("Obj-C"),
+                              ProjectPart::LatestCVersion,
+                              ProjectPart::ObjectiveCExtensions);
+        }
     }
 
     return languages;