diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-10-15 13:32:20 +0200 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2021-10-20 15:04:51 +0000 |
| commit | bb8d84c358eb4b324258b936bdeb211fdd90d7cd (patch) | |
| tree | 8f331db097ff4c2af0c7250b9fa8a1322cc47f65 /src/corelib/io/qfilesystemengine_unix.cpp | |
| parent | 71652ad4bf7b4cfe35473c3f93213c16e7653135 (diff) | |
Make QDir::mkpath() return true when given an existing root path
On macOs with APFS mkdir sets errno to EISDIR, so take the error code
into account.
Pick-to: 6.2
Fixes: QTBUG-97110
Change-Id: I8e7d10c95430a2802bdbfbf94dd65219bd9071a7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/io/qfilesystemengine_unix.cpp')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_unix.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 150fb18527..054e9ed2fe 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -1123,6 +1123,8 @@ static bool createDirectoryWithParents(const QByteArray &nativeName, bool should if (shouldMkdirFirst && QT_MKDIR(nativeName, 0777) == 0) return true; + if (errno == EISDIR) + return true; if (errno == EEXIST) return isDir(nativeName); if (errno != ENOENT) |