feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Debugger: Prefer files in current project over files in sysroot

Browse Source 
Only use file in sysroot as ultimate fallback.

Change-Id: I3dd3b87228c87387f994792f74634add03845ad7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
Kai Koehne
2011-10-28 13:15:18 +02:00
parent 1dfe884c17
commit accf6d0e8b
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/utils/fileinprojectfinder.cpp
View File

@@ -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 // check if absolute path is found in sysroot
if (!m_sysroot.isEmpty()) { if (!m_sysroot.isEmpty()) {
const QString sysrootPath = m_sysroot + originalPath; 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) if (success)
*success = false; *success = false;