diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-07-22 06:10:44 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@theqtcompany.com> | 2015-09-09 08:02:48 +0000 |
| commit | 14960f52276d82600913b52b0ebbf4d5372debe2 (patch) | |
| tree | 96721fd5b9d6599d4aa6cbdab51fb51f422c60a0 /src/corelib/io/io.pri | |
| parent | 924d4aefd5315c11d0637e2ba1a6b02246e89c44 (diff) | |
Refactor standard paths for OS X and iOS.
This consolidates the _mac and _ios implementations into one, since most
details of OS X and iOS are shared.
The code base no longer uses deprecated Carbon File Manager APIs,
instead using Foundation APIs and semi-hardcoding the two cases where a
modern API is not available (Preferences and Fonts).
A few paths have changed in order to be more similar between OS X and
iOS where appropriate.
Lastly, OS X now supports QT_NO_STANDARDPATHS.
Change-Id: I63fa96e3ab80f8c6cf8a24243f859977e8c46421
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
Diffstat (limited to 'src/corelib/io/io.pri')
| -rw-r--r-- | src/corelib/io/io.pri | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index f496d037d8..d8cc004168 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -149,19 +149,12 @@ win32 { } freebsd: LIBS_PRIVATE += -lutil # qlockfile_unix.cpp requires this mac { + SOURCES += io/qstorageinfo_mac.cpp + OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm osx { OBJECTIVE_SOURCES += io/qfilesystemwatcher_fsevents.mm HEADERS += io/qfilesystemwatcher_fsevents_p.h - } - macx { - SOURCES += io/qstorageinfo_mac.cpp - OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm LIBS += -framework DiskArbitration -framework IOKit - } else:ios { - OBJECTIVE_SOURCES += io/qstandardpaths_ios.mm - SOURCES += io/qstorageinfo_mac.cpp - } else { - SOURCES += io/qstandardpaths_unix.cpp } } else:blackberry { SOURCES += \ |