AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Haiku: Fix tst_qfileselector.cpp unit test

Browse Source 
Add the missing test data for haiku platform selector
and adapt unit test to use them.

Change-Id: I578e7f7e04f2a4c68f23d5356ea201e9562dbe6c
Reviewed-by: Augustin Cavalier <waddlesplash@gmail.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Tobias Koenig 2015-02-13 14:04:34 +00:00
parent 8c9d6a334c
commit 8f27586b1e
5 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
tests/auto/corelib/io/qfileselector/platforms/+haiku/test Normal file
View File

0
tests/auto/corelib/io/qfileselector/platforms/+haiku/test2 Normal file
View File

0
tests/auto/corelib/io/qfileselector/platforms/+unix/+haiku/test Normal file
View File

3
tests/auto/corelib/io/qfileselector/qfileselector.qrc
View File

@ -19,6 +19,7 @@
<file>platforms/+unix/+darwin/+mac/+osx/test</file> <file>platforms/+unix/+darwin/+mac/+osx/test</file>
<file>platforms/+unix/+darwin/+mac/test</file> <file>platforms/+unix/+darwin/+mac/test</file>
<file>platforms/+unix/+darwin/test</file> <file>platforms/+unix/+darwin/test</file>
<file>platforms/+unix/+haiku/test</file>
<file>platforms/+unix/+linux/test</file> <file>platforms/+unix/+linux/test</file>
<file>platforms/+unix/test</file> <file>platforms/+unix/test</file>
<file>platforms/+windows/+wince/test</file> <file>platforms/+windows/+wince/test</file>
@ -30,6 +31,7 @@
<file>platforms/+osx/test</file> <file>platforms/+osx/test</file>
<file>platforms/+darwin/test</file> <file>platforms/+darwin/test</file>
<file>platforms/+mac/test</file> <file>platforms/+mac/test</file>
<file>platforms/+haiku/test</file>
<file>platforms/+linux/test</file> <file>platforms/+linux/test</file>
<file>platforms/+wince/test</file> <file>platforms/+wince/test</file>
@ -39,6 +41,7 @@
<file>platforms/+blackberry/test2</file> <file>platforms/+blackberry/test2</file>
<file>platforms/+ios/test2</file> <file>platforms/+ios/test2</file>
<file>platforms/+osx/test2</file> <file>platforms/+osx/test2</file>
<file>platforms/+haiku/test2</file>
<file>platforms/+linux/test2</file> <file>platforms/+linux/test2</file>
<file>platforms/+wince/test2</file> <file>platforms/+wince/test2</file>
<file>platforms/+winnt/test2</file> <file>platforms/+winnt/test2</file>

2
tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
View File

@ -89,7 +89,7 @@ void tst_QFileSelector::basicTest_data()
QString expectedPlatform2File(""); //Only the last selector QString expectedPlatform2File(""); //Only the last selector
QString expectedPlatform3File; // Only the first selector (the family) 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_BLACKBERRY) && \
!defined(Q_OS_DARWIN) && !defined(Q_OS_LINUX) !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. /* 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 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 lead to a case where we don't have that file so we can't expect the concatenation of platform