From 4f9b2cb026e334eb24dd35b05422b9dad6d8a2f3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 21 Sep 2017 13:14:40 +0200 Subject: Remove duplicate qnx from the platform file selector names Update the QFileSelector tests for QNX. Co-authored-by: James McDonnell Change-Id: I68a8fde86725596323b539433287ac1a18fac1eb Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qfileselector/platforms/+qnx/test | 0 tests/auto/corelib/io/qfileselector/platforms/+qnx/test2 | 0 tests/auto/corelib/io/qfileselector/platforms/+unix/+qnx/test | 0 tests/auto/corelib/io/qfileselector/qfileselector.qrc | 3 +++ tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp | 2 +- 5 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+qnx/test create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+qnx/test2 create mode 100644 tests/auto/corelib/io/qfileselector/platforms/+unix/+qnx/test (limited to 'tests/auto/corelib/io') diff --git a/tests/auto/corelib/io/qfileselector/platforms/+qnx/test b/tests/auto/corelib/io/qfileselector/platforms/+qnx/test new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+qnx/test2 b/tests/auto/corelib/io/qfileselector/platforms/+qnx/test2 new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/auto/corelib/io/qfileselector/platforms/+unix/+qnx/test b/tests/auto/corelib/io/qfileselector/platforms/+unix/+qnx/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 ea9b8270e0..54b2e0a0e2 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc @@ -21,6 +21,7 @@ platforms/+unix/+darwin/test platforms/+unix/+haiku/test platforms/+unix/+linux/test + platforms/+unix/+qnx/test platforms/+unix/test platforms/+windows/+wince/test platforms/+windows/+winnt/test @@ -34,6 +35,7 @@ platforms/+mac/test platforms/+haiku/test platforms/+linux/test + platforms/+qnx/test platforms/+wince/test platforms/+winrt/test @@ -44,6 +46,7 @@ platforms/+macos/test2 platforms/+haiku/test2 platforms/+linux/test2 + platforms/+qnx/test2 platforms/+wince/test2 platforms/+winnt/test2 platforms/+winrt/test2 diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp index c537e43802..c9f1e3d9f6 100644 --- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp +++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp @@ -86,7 +86,7 @@ void tst_QFileSelector::basicTest_data() 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_DARWIN) && !defined(Q_OS_LINUX) && !defined(Q_OS_HAIKU) + !defined(Q_OS_DARWIN) && !defined(Q_OS_LINUX) && !defined(Q_OS_HAIKU) && !defined(Q_OS_QNX) /* 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 -- cgit v1.2.3