diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2013-09-19 07:57:54 -0400 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 05:09:16 +0200 |
| commit | f9365b0acc87808599ebf2e121abd67eac946743 (patch) | |
| tree | 4427a7cb0831a1543dadbae3acbd5f3a7f0845fd | |
| parent | 642ebccaad1656420fc5a9b37c04bec02ec079b4 (diff) | |
Use the correct identifier for the OS X operating system.
This is consistent with other areas of Qt:
qmake, Qt.platform.os (QML), qbs.targetOS (QBS), and #define Q_OS_OSX.
Change-Id: Ibf98e6ba3556a14187dadae1b0235e9c907c9001
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfileselector/platforms/+osx/test (renamed from tests/auto/corelib/io/qfileselector/platforms/+mac/test) | 0 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qfileselector/qfileselector.qrc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index c7d0879fea..d67ea80e51 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -140,7 +140,7 @@ QFileSelectorPrivate::QFileSelectorPrivate() Selectors normally available are \list - \li platform, one of: android, blackberry, ios, windows, mac, linux, generic_unix or unknown. + \li platform, one of: android, blackberry, ios, windows, osx, linux, generic_unix or unknown. \li locale, same as QLocale::system().name(). \endlist @@ -360,8 +360,8 @@ QStringList QFileSelectorPrivate::platformSelectors() ret << QStringLiteral("windows"); #elif defined(Q_OS_LINUX) ret << QStringLiteral("linux"); -#elif defined(Q_OS_MAC) - ret << QStringLiteral("mac"); +#elif defined(Q_OS_OSX) + ret << QStringLiteral("osx"); #elif defined(Q_OS_UNIX) ret << QStringLiteral("generic_unix"); #endif diff --git a/tests/auto/corelib/io/qfileselector/platforms/+mac/test b/tests/auto/corelib/io/qfileselector/platforms/+osx/test index e69de29bb2..e69de29bb2 100644 --- a/tests/auto/corelib/io/qfileselector/platforms/+mac/test +++ b/tests/auto/corelib/io/qfileselector/platforms/+osx/test diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc index cc8affafca..c644e41107 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc @@ -14,7 +14,7 @@ <file>platforms/+android/test</file> <file>platforms/+blackberry/test</file> <file>platforms/+ios/test</file> - <file>platforms/+mac/test</file> + <file>platforms/+osx/test</file> <file>platforms/+wince/test</file> <file>platforms/+windows/test</file> <file>platforms/+linux/test</file> |