New File Wizard: Pay more attention to common path length

For qmake project some projects use .pri files in subdirectotires to
structure their project files. Those should be preferred to .pro files
higher up in the tree. While there are also .pri files that set common
variables between multiple .pro files, those are unlikely to be in the
leafs.

Change-Id: Ida6b4fc887fd8c273988ca71f2ead9d4e5929ae5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 10 insertions, 13 deletions

diff --git a/src/plugins/projectexplorer/projectfilewizardextension.cpp b/src/plugins/projectexplorer/projectfilewizardextension.cpp
index 9c4cd70caa..4c9f540740 100644
--- a/src/plugins/projectexplorer/projectfilewizardextension.cpp
+++ b/src/plugins/projectexplorer/projectfilewizardextension.cpp
@@ -288,19 +288,16 @@ static int findMatchingProject(const QList<FolderEntry> &projects,
         const FolderEntry &entry = projects.at(p);
         const QString &projectDirectory = entry.directory;
         const int projectDirectorySize = projectDirectory.size();
-        if (entry.priority > bestMatchPriority) {
-            if (commonPath.startsWith(projectDirectory)) {
-                bestMatchPriority = entry.priority;
-                bestMatchLength = projectDirectory.size();
-                bestMatch = p;
-            }
-        } else if (entry.priority == bestMatchPriority) {
-            if (projectDirectorySize > bestMatchLength
-                    && commonPath.startsWith(projectDirectory)) {
-                bestMatchPriority = entry.priority;
-                bestMatchLength = projectDirectory.size();
-                bestMatch = p;
-            }
+        if (!commonPath.startsWith(projectDirectory))
+            continue;
+
+        bool betterMatch = projectDirectorySize > bestMatchLength
+                || (projectDirectorySize == bestMatchLength && entry.priority > bestMatchPriority);
+
+        if (betterMatch) {
+            bestMatchPriority = entry.priority;
+            bestMatchLength = projectDirectory.size();
+            bestMatch = p;
         }
     }
     return bestMatch;