diff options
| author | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2015-10-15 16:24:54 +0300 |
|---|---|---|
| committer | Louai Al-Khanji <louai.al-khanji@theqtcompany.com> | 2015-11-21 15:38:39 +0000 |
| commit | dbb7817e13bc7f7ccb8f04b00a65eb3dcf8d25f8 (patch) | |
| tree | 6b786e700e14bfe100bebd753b7133830231dac4 /tests/auto/corelib/io/qfileselector | |
| parent | 496823b9a856d649c468d03b64241562807f3c16 (diff) | |
Remove remaining support for Blackberry
The platform is no longer supported or actively maintained, and is
in the way for improvements to the Unix event dispatcher and QProcess
implementations.
Change-Id: I3935488ca12e2139ea5f46068d7665a453e20526
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'tests/auto/corelib/io/qfileselector')
4 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/corelib/io/qfileselector/platforms/+blackberry/test b/tests/auto/corelib/io/qfileselector/platforms/+blackberry/test deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/io/qfileselector/platforms/+blackberry/test +++ /dev/null diff --git a/tests/auto/corelib/io/qfileselector/platforms/+blackberry/test2 b/tests/auto/corelib/io/qfileselector/platforms/+blackberry/test2 deleted file mode 100644 index e69de29bb2..0000000000 --- a/tests/auto/corelib/io/qfileselector/platforms/+blackberry/test2 +++ /dev/null diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc index 6e2699774d..47ace78528 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc @@ -14,7 +14,6 @@ <!-- platforms/test: deepest possible selection --> <file>platforms/test</file> <file>platforms/+unix/+android/test</file> - <file>platforms/+unix/+blackberry/test</file> <file>platforms/+unix/+darwin/+mac/+ios/test</file> <file>platforms/+unix/+darwin/+mac/+osx/test</file> <file>platforms/+unix/+darwin/+mac/test</file> @@ -26,7 +25,6 @@ <file>platforms/+windows/+winnt/test</file> <file>platforms/+windows/test</file> <file>platforms/+android/test</file> - <file>platforms/+blackberry/test</file> <file>platforms/+ios/test</file> <file>platforms/+osx/test</file> <file>platforms/+darwin/test</file> @@ -38,7 +36,6 @@ <!-- platforms/test2: shallow selection for the deepest selector --> <file>platforms/test2</file> <file>platforms/+android/test2</file> - <file>platforms/+blackberry/test2</file> <file>platforms/+ios/test2</file> <file>platforms/+osx/test2</file> <file>platforms/+haiku/test2</file> diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp index 87381f4c4e..4da3419741 100644 --- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp +++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp @@ -88,7 +88,7 @@ void tst_QFileSelector::basicTest_data() QString expectedPlatform1File(":/platforms"); QString expectedPlatform2File(""); //Only the last selector QString expectedPlatform3File; // Only the first selector (the family) -#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && \ +#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) && \ !defined(Q_OS_DARWIN) && !defined(Q_OS_LINUX) && !defined(Q_OS_HAIKU) /* 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 |