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

FileInProjectFinder/Debugger: Use Utils::FileName for sysroot

Browse Source 
Change-Id: Id937f927ba6137fd04f742f31d1b260afbe42db4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Ulf Hermann
2018-08-21 17:46:47 +02:00
parent 767137157e
commit 4ecc46626b
12 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -102,16 +102,12 @@ void FileInProjectFinder::setProjectFiles(const FileNameList &projectFiles)
m_cache.clear();
}
void FileInProjectFinder::setSysroot(const QString &sysroot)
void FileInProjectFinder::setSysroot(const FileName &sysroot)
{
QString newsys = sysroot;
while (newsys.endsWith(QLatin1Char('/')))
newsys.remove(newsys.length() - 1, 1);
if (m_sysroot == newsys)
if (m_sysroot == sysroot)
return;
m_sysroot = newsys;
m_sysroot = sysroot;
m_cache.clear();
}
@@ -274,9 +270,10 @@ bool FileInProjectFinder::findFileOrDirectory(const QString &originalPath, FileH
// check if absolute path is found in sysroot
if (!m_sysroot.isEmpty()) {
const QString sysrootPath = m_sysroot + originalPath;
if (checkPath(sysrootPath, fileHandler, directoryHandler))
return handleSuccess(originalPath, sysrootPath, "in sysroot");
FileName sysrootPath = m_sysroot;
sysrootPath.appendPath(originalPath);
if (checkPath(sysrootPath.toString(), fileHandler, directoryHandler))
return handleSuccess(originalPath, sysrootPath.toString(), "in sysroot");
}
qCDebug(finderLog) << "FileInProjectFinder: couldn't find file!";