diff options
| author | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-07-13 20:16:44 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-22 00:09:20 +0000 |
| commit | 46a372e1a115fb05b746339c790a7f3e5d6d01fc (patch) | |
| tree | ac26264e5d38a3c6e3c4389c38db7351f1a9731c /src/corelib/io/qfilesystemengine_p.h | |
| parent | 827d0c023222c58443bd825c6287949a2cc07de7 (diff) | |
Modernize and unify filesystem code on Apple platforms.
Replace deprecated File Manager APIs with modern equivalents.
Change some Q_OS_MACX to Q_OS_DARWIN in file system related code.
All of these apply to iOS as well as OS X, and were ifdef'ed for OS X
only primarily due to legacy reasons - carryovers from Qt 4 or Carbon
APIs which have since been refactored into using CoreFoundation.
This also makes the code consistent with the documentation.
Change-Id: I414e9bdfffff731413ddf16171b1317027d87caf
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Diffstat (limited to 'src/corelib/io/qfilesystemengine_p.h')
| -rw-r--r-- | src/corelib/io/qfilesystemengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h index 06d5db637a..6db9319836 100644 --- a/src/corelib/io/qfilesystemengine_p.h +++ b/src/corelib/io/qfilesystemengine_p.h @@ -76,7 +76,7 @@ public: static QString resolveGroupName(uint groupId); #endif -#if defined(Q_OS_MACX) +#if defined(Q_OS_DARWIN) static QString bundleName(const QFileSystemEntry &entry); #else static QString bundleName(const QFileSystemEntry &entry) { Q_UNUSED(entry) return QString(); } |