diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-01-28 07:29:53 -0500 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-04 19:36:58 +0100 |
| commit | fdef360bad0f2f1059ff81f1bdd608332541abac (patch) | |
| tree | d17dbfec3a134ae819ba7a0ace9889e716981208 /src/corelib/io/qfileselector.cpp | |
| parent | cc88e6e92c806def34bce8cdcab275934ab646bf (diff) | |
QFileSelector: correct the macros for Apple platforms.
This fixes a serious regression from
7d72516b52b20b0782d972224a55a43e74b8ae5a.
[ChangeLog] QFileSelector: the identifier for OS X has been changed back
to 'osx' from 'mac', and 'mac' and 'darwin' have now been added as
selectors for Darwin OS (which is the base of both OS X and iOS).
Task-number: QTBUG-35073
Change-Id: I83183e34c5a697338cc1ddcac33a41bd379ded12
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/corelib/io/qfileselector.cpp')
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index 13e5f8e5d1..b4021c060f 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -157,7 +157,7 @@ QFileSelectorPrivate::QFileSelectorPrivate() Selectors normally available are \list \li platform, any of the following strings which match the platform the application is running - on: android, blackberry, ios, mac, linux, wince, unix, windows. + on: android, blackberry, ios, osx, darwin, mac, linux, wince, unix, windows. \li locale, same as QLocale::system().name(). \endlist @@ -374,12 +374,16 @@ QStringList QFileSelectorPrivate::platformSelectors() ret << QStringLiteral("blackberry"); # elif defined(Q_OS_QNX) ret << QStringLiteral("qnx"); -# elif defined(Q_OS_IOS) - ret << QStringLiteral("ios"); # elif defined(Q_OS_LINUX) ret << QStringLiteral("linux"); -# elif defined(Q_OS_MAC) - ret << QStringLiteral("mac"); +# elif defined(Q_OS_DARWIN) + ret << QStringLiteral("darwin"); + ret << QStringLiteral("mac"); // compatibility synonym +# if defined(Q_OS_IOS) + ret << QStringLiteral("ios"); +# elif defined(Q_OS_OSX) + ret << QStringLiteral("osx"); +# endif # else struct utsname u; if (uname(&u) != -1) |