From fdef360bad0f2f1059ff81f1bdd608332541abac Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 28 Jan 2014 07:29:53 -0500 Subject: [PATCH] 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 --- src/corelib/io/qfileselector.cpp | 14 +++++++++----- .../platforms/{+unix/+ios => +darwin}/test | 0 .../platforms/{+unix/+mac/test => +darwin/test2} | 0 .../corelib/io/qfileselector/platforms/+osx/test2 | 0 .../platforms/+unix/+darwin/+mac/+ios/test | 0 .../platforms/+unix/+darwin/+mac/+osx/test | 0 .../platforms/+unix/+darwin/+mac/test | 0 .../io/qfileselector/platforms/+unix/+darwin/test | 0 .../corelib/io/qfileselector/qfileselector.qrc | 10 +++++++--- .../corelib/io/qfileselector/tst_qfileselector.cpp | 3 ++- 10 files changed, 18 insertions(+), 9 deletions(-) rename tests/auto/corelib/io/qfileselector/platforms/{+unix/+ios => +darwin}/test (100%) rename tests/auto/corelib/io/qfileselector/platforms/{+unix/+mac/test => +darwin/test2} (100%) create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+osx/test2 create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+ios/test create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/test create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/test create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/test 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) diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+ios/test b/tests/auto/corelib/io/qfileselector/platforms/+darwin/test similarity index 100% rename from tests/auto/corelib/io/qfileselector/platforms/+unix/+ios/test rename to tests/auto/corelib/io/qfileselector/platforms/+darwin/test diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+mac/test b/tests/auto/corelib/io/qfileselector/platforms/+darwin/test2 similarity index 100% rename from tests/auto/corelib/io/qfileselector/platforms/+unix/+mac/test rename to tests/auto/corelib/io/qfileselector/platforms/+darwin/test2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+osx/test2 b/tests/auto/corelib/io/qfileselector/platforms/+osx/test2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+ios/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+ios/test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/+osx/test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/+mac/test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+darwin/test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc index abfead2a55..8fe7b841d2 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc @@ -13,8 +13,10 @@ platforms/test platforms/+unix/+android/test platforms/+unix/+blackberry/test - platforms/+unix/+ios/test - platforms/+unix/+mac/test + platforms/+unix/+darwin/+mac/+ios/test + platforms/+unix/+darwin/+mac/+osx/test + platforms/+unix/+darwin/+mac/test + platforms/+unix/+darwin/test platforms/+windows/+wince/test platforms/+windows/test platforms/+windows/test2 @@ -24,12 +26,14 @@ platforms/+android/test2 platforms/+blackberry/test2 platforms/+ios/test2 - platforms/+mac/test2 + platforms/+osx/test2 platforms/+linux/test2 platforms/+wince/test2 platforms/+android/test platforms/+blackberry/test platforms/+ios/test + platforms/+osx/test + platforms/+darwin/test platforms/+mac/test platforms/+linux/test platforms/+wince/test diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp index d6461c3aba..4ccaecba00 100644 --- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp +++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp @@ -94,7 +94,8 @@ void tst_QFileSelector::basicTest_data() QString test2("/test2"); QString expectedPlatform1File(":/platforms"); QString expectedPlatform2File(""); //Only the last selector -#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_IOS) && !defined(Q_OS_LINUX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && \ + !defined(Q_OS_DARWIN) && !defined(Q_OS_LINUX) /* We are only aware of specific unixes, and do not have test files for any of the others. However those unixes can get a selector added from the result of a uname call, so this will lead to a case where we don't have that file so we can't expect the concatenation of platform