From accf6d0e8b5e856f9f2bd25d73079f11f36d87e1 Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@nokia.com>
Date: Fri, 28 Oct 2011 13:15:18 +0200
Subject: [PATCH] Debugger: Prefer files in current project over files in
 sysroot

Only use file in sysroot as ultimate fallback.

Change-Id: I3dd3b87228c87387f994792f74634add03845ad7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
---
 src/libs/utils/fileinprojectfinder.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/libs/utils/fileinprojectfinder.cpp b/src/libs/utils/fileinprojectfinder.cpp
index f98bbfb0e9f..42486a72fff 100644
--- a/src/libs/utils/fileinprojectfinder.cpp
+++ b/src/libs/utils/fileinprojectfinder.cpp
@@ -190,6 +190,17 @@ QString FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const
         }
     }
 
+    // find (solely by filename) in project files
+    const QString fileName = QFileInfo(originalPath).fileName();
+    foreach (const QString &f, m_projectFiles) {
+        if (QFileInfo(f).fileName() == fileName) {
+            m_cache.insert(originalPath, f);
+            if (success)
+                *success = true;
+            return f;
+        }
+    }
+
     // check if absolute path is found in sysroot
     if (!m_sysroot.isEmpty()) {
         const QString sysrootPath = m_sysroot + originalPath;
@@ -201,17 +212,6 @@ QString FileInProjectFinder::findFile(const QUrl &fileUrl, bool *success) const
         }
     }
 
-    // finally, find solely by filename in project files
-    const QString fileName = QFileInfo(originalPath).fileName();
-    foreach (const QString &f, m_projectFiles) {
-        if (QFileInfo(f).fileName() == fileName) {
-            m_cache.insert(originalPath, f);
-            if (success)
-                *success = true;
-            return f;
-        }
-    }
-
     if (success)
         *success = false;