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

ProjectExplorer: Proliferate FilePath a bit

Browse Source 
Change-Id: Ia671a1de17b9e58764375c5f64cc47b053b0725a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2022-11-25 14:06:47 +01:00
parent 4d325522e0
commit 2704f8ff0b
17 changed files with 54 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/projectexplorer/toolchain.cpp
View File

@@ -192,7 +192,7 @@ bool ToolChain::isValid() const
return d->m_isValid.value_or(false);
}
QStringList ToolChain::includedFiles(const QStringList &flags, const QString &directory) const
FilePaths ToolChain::includedFiles(const QStringList &flags, const FilePath &directory) const
{
Q_UNUSED(flags)
Q_UNUSED(directory)
@@ -466,12 +466,12 @@ Utils::LanguageVersion ToolChain::languageVersion(const Utils::Id &language, con
}
}
QStringList ToolChain::includedFiles(const QString &option,
const QStringList &flags,
const QString &directoryPath,
PossiblyConcatenatedFlag possiblyConcatenated)
FilePaths ToolChain::includedFiles(const QString &option,
const QStringList &flags,
const FilePath &directoryPath,
PossiblyConcatenatedFlag possiblyConcatenated)
{
QStringList result;
FilePaths result;
for (int i = 0; i < flags.size(); ++i) {
QString includeFile;
@@ -484,11 +484,8 @@ QStringList ToolChain::includedFiles(const QString &option,
if (includeFile.isEmpty() && flag == option && i + 1 < flags.size())
includeFile = flags[++i];
if (!includeFile.isEmpty()) {
if (!QFileInfo(includeFile).isAbsolute())
includeFile = directoryPath + "/" + includeFile;
result.append(QDir::cleanPath(includeFile));
}
if (!includeFile.isEmpty())
result.append(directoryPath.resolvePath(includeFile));
}
return result;