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

Utils: avoid QFileInfo in FilePath::fromStringWithExtension

Browse Source 
Change-Id: I853e678e98af09a53d1165c51cf00377df1b7f4d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
David Schulz
2021-09-08 12:25:15 +02:00
parent 75e0a3678a
commit a04e1eaf84
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/libs/utils/filepath.cpp
View File

@@ -899,16 +899,15 @@ FilePath FilePath::fromStringWithExtension(const QString &filepath, const QStrin
if (filepath.isEmpty() || defaultExtension.isEmpty())
return FilePath::fromString(filepath);
QString rc = filepath;
QFileInfo fi(filepath);
FilePath rc = FilePath::fromString(filepath);
// Add extension unless user specified something else
const QChar dot = QLatin1Char('.');
if (!fi.fileName().contains(dot)) {
if (!rc.fileName().contains(dot)) {
if (!defaultExtension.startsWith(dot))
rc += dot;
rc += defaultExtension;
rc.stringAppended(dot);
rc.stringAppended(defaultExtension);
}
return FilePath::fromString(rc);
return rc;
}
/// Constructs a FilePath from \a filePath