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

GenericProject: Re-introduce variable resolving in include paths

Browse Source 
Variable expansion and relative path resolving were accidentally removed
in 25ff15a1fb. Relative path resolving was re-added in 214968a80b, which
is superseded here.

Fixes: QTCREATORBUG-27401
Change-Id: Ida09e7b486765942c43acf55c4ef9c04eb3df12b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
Christian Kandeler
2022-04-20 11:29:18 +02:00
parent 8a252099a1
commit d0a192064e
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/plugins/genericprojectmanager/genericproject.cpp
View File

@@ -435,17 +435,22 @@ void GenericBuildSystem::parse(RefreshOptions options)
if (options & Configuration) {
m_rawProjectIncludePaths = readLines(m_includesFileName);
Utils::FilePaths normalPaths;
Utils::FilePaths frameworkPaths;
QStringList normalPaths;
QStringList frameworkPaths;
const auto baseDir = Utils::FilePath::fromString(m_includesFileName).parentDir();
for (const QString &rawPath : qAsConst(m_rawProjectIncludePaths)) {
if (rawPath.startsWith("-F"))
frameworkPaths << baseDir.resolvePath(rawPath.mid(2));
frameworkPaths << rawPath.mid(2);
else
normalPaths << baseDir.resolvePath(rawPath);
normalPaths << rawPath;
}
m_projectIncludePaths = toUserHeaderPaths(normalPaths);
m_projectIncludePaths << toFrameworkHeaderPaths(frameworkPaths);
const auto expandedPaths = [this](const QStringList &paths) {
return Utils::transform(processEntries(paths), [](const auto &pair) {
return pair.first;
});
};
m_projectIncludePaths = toUserHeaderPaths(expandedPaths(normalPaths));
m_projectIncludePaths << toFrameworkHeaderPaths(expandedPaths(frameworkPaths));
m_cxxflags = readFlags(m_cxxflagsFileName);
m_cflags = readFlags(m_cflagsFileName);
}