diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-01-16 21:03:19 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2023-02-14 16:50:25 +0000 |
| commit | 19160fb46a11517e10eb4d19b9343a4f75b298a7 (patch) | |
| tree | cdbcb3726e8101a210afbff104d8f857d579eaa5 /src/corelib/io/qdir.cpp | |
| parent | 7cf7fe93efbfb8a8fd5ff5790c63c3be7dceabe6 (diff) | |
| download | qtbase-19160fb46a11517e10eb4d19b9343a4f75b298a7.tar.gz | |
Fix few QFileInfo and QDir calls
Return the file engine impl of QFileInfo::completeBaseName() and
QDir::absolutePath() and QFileInfo::fileName() (based on
QAbstractFileEngine::BaseName) if the file engine impl is valid.
Amends f77668ffec48d8aaad7c74069c6f3e770a305ae1.
Task-number: QTBUG-98974
Change-Id: I28a8c75a6f25e30012b0791c12dbde51bfe8f62c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 249d613a60aa6a1347ebc1c29902049247b93324)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index bb0633864b..eb55696ccf 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -630,8 +630,12 @@ QString QDir::path() const QString QDir::absolutePath() const { Q_D(const QDir); - d->resolveAbsoluteEntry(); - return d->absoluteDirEntry.filePath(); + if (!d->fileEngine) { + d->resolveAbsoluteEntry(); + return d->absoluteDirEntry.filePath(); + } + + return d->fileEngine->fileName(QAbstractFileEngine::AbsoluteName); } /*! |