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

Utils: Expand FilePaths per part, not as a full string

Browse Source 
Avoid the potential side effects from the toString/fromUserInput round
trip.

Fixes: QTCREATORBUG-31259
Change-Id: Id004d71079b4ef8ac26b927921c5cd7a23531110
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-07-18 16:20:44 +02:00
parent 69906c6525
commit e8855f97d5
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/libs/utils/macroexpander.cpp
View File

@@ -274,7 +274,10 @@ QString MacroExpander::expand(const QString &stringWithVariables) const
FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const FilePath MacroExpander::expand(const FilePath &fileNameWithVariables) const
{ {
// We want single variables to expand to fully qualified strings. // We want single variables to expand to fully qualified strings.
return FilePath::fromUserInput(expand(fileNameWithVariables.toString())); const QString host = expand(fileNameWithVariables.host().toString());
const QString scheme = expand(fileNameWithVariables.scheme().toString());
const QString path = expand(fileNameWithVariables.path());
return FilePath::fromParts(scheme, host, path);
} }
QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const QByteArray MacroExpander::expand(const QByteArray &stringWithVariables) const