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

ProjectExplorer: Fix builtin header path query

Browse Source 
Change-Id: Iad8883cef88ac605f5ef3bc7e9922a02e4da5bd3
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Marcus Tillmanns
2022-12-02 08:25:12 +01:00
parent 55284ba124
commit 88728a414c
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/cppeditor/headerpathfilter.cpp
View File

@@ -124,7 +124,7 @@ void HeaderPathFilter::tweakHeaderPaths()
auto split = resourceIterator(builtInHeaderPaths); auto split = resourceIterator(builtInHeaderPaths);
if (!clangIncludeDirectory.isEmpty()) if (!clangIncludeDirectory.isEmpty())
builtInHeaderPaths.insert(split, HeaderPath::makeBuiltIn(clangIncludeDirectory)); builtInHeaderPaths.insert(split, HeaderPath::makeBuiltIn(clangIncludeDirectory.path()));
} }
void HeaderPathFilter::addPreIncludesPath() void HeaderPathFilter::addPreIncludesPath()

5
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -193,7 +193,10 @@ HeaderPaths GccToolChain::gccHeaderPaths(const FilePath &gcc,
thisHeaderKind = HeaderPathType::Framework; thisHeaderKind = HeaderPathType::Framework;
} }
const QString headerPath = QFileInfo(QFile::decodeName(line)).canonicalFilePath(); const FilePath headerPath
= FilePath::fromString(QString::fromUtf8(line)).onDevice(gcc).canonicalPath();
if (!headerPath.isEmpty())
builtInHeaderPaths.append({headerPath, thisHeaderKind}); builtInHeaderPaths.append({headerPath, thisHeaderKind});
} else if (line.startsWith("End of search list.")) { } else if (line.startsWith("End of search list.")) {
break; break;

3
src/plugins/projectexplorer/headerpath.h
View File

@@ -25,7 +25,8 @@ public:
HeaderPath(const QString &path, HeaderPathType type) : path(path), type(type) { } HeaderPath(const QString &path, HeaderPathType type) : path(path), type(type) { }
HeaderPath(const char *path, HeaderPathType type) : HeaderPath(QLatin1String(path), type) {} HeaderPath(const char *path, HeaderPathType type) : HeaderPath(QLatin1String(path), type) {}
HeaderPath(const Utils::FilePath &path, HeaderPathType type) HeaderPath(const Utils::FilePath &path, HeaderPathType type)
: HeaderPath(path.toString(), type) { } : HeaderPath(path.path(), type)
{}
bool operator==(const HeaderPath &other) const bool operator==(const HeaderPath &other) const
{ {