1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove duplicate qnx from the platform file selector names

Browse Source 
Update the QFileSelector tests for QNX.

Co-authored-by: James McDonnell <jmcdonnell@blackberry.com>
Change-Id: I68a8fde86725596323b539433287ac1a18fac1eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Liang Qi 2017-09-21 13:14:40 +02:00
parent 18f0a45964
commit 4f9b2cb026
6 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/io/qfileselector.cpp
View File

@ -146,7 +146,7 @@ QFileSelectorPrivate::QFileSelectorPrivate()
Selectors normally available are Selectors normally available are
\list \list
\li platform, any of the following strings which match the platform the application is running \li platform, any of the following strings which match the platform the application is running
on (list not exhaustive): android, ios, osx, darwin, mac, linux, wince, unix, windows. on (list not exhaustive): android, ios, osx, darwin, mac, macos, linux, qnx, unix, windows.
On Linux, if it can be determined, the name of the distribution too, like debian, On Linux, if it can be determined, the name of the distribution too, like debian,
fedora or opensuse. fedora or opensuse.
\li locale, same as QLocale().name(). \li locale, same as QLocale().name().
@ -373,8 +373,8 @@ QStringList QFileSelectorPrivate::platformSelectors()
# endif # endif
#elif defined(Q_OS_UNIX) #elif defined(Q_OS_UNIX)
ret << QStringLiteral("unix"); ret << QStringLiteral("unix");
# if !defined(Q_OS_ANDROID) # if !defined(Q_OS_ANDROID) && !defined(Q_OS_QNX)
// we don't want "linux" for Android // we don't want "linux" for Android or two instances of "qnx" for QNX
ret << QSysInfo::kernelType(); ret << QSysInfo::kernelType();
# ifdef Q_OS_MAC # ifdef Q_OS_MAC
ret << QStringLiteral("mac"); // compatibility, since kernelType() is "darwin" ret << QStringLiteral("mac"); // compatibility, since kernelType() is "darwin"

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

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

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

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

@ -21,6 +21,7 @@
<file>platforms/+unix/+darwin/test</file> <file>platforms/+unix/+darwin/test</file>
<file>platforms/+unix/+haiku/test</file> <file>platforms/+unix/+haiku/test</file>
<file>platforms/+unix/+linux/test</file> <file>platforms/+unix/+linux/test</file>
<file>platforms/+unix/+qnx/test</file>
<file>platforms/+unix/test</file> <file>platforms/+unix/test</file>
<file>platforms/+windows/+wince/test</file> <file>platforms/+windows/+wince/test</file>
<file>platforms/+windows/+winnt/test</file> <file>platforms/+windows/+winnt/test</file>
@ -34,6 +35,7 @@
<file>platforms/+mac/test</file> <file>platforms/+mac/test</file>
<file>platforms/+haiku/test</file> <file>platforms/+haiku/test</file>
<file>platforms/+linux/test</file> <file>platforms/+linux/test</file>
<file>platforms/+qnx/test</file>
<file>platforms/+wince/test</file> <file>platforms/+wince/test</file>
<file>platforms/+winrt/test</file> <file>platforms/+winrt/test</file>
@ -44,6 +46,7 @@
<file>platforms/+macos/test2</file> <file>platforms/+macos/test2</file>
<file>platforms/+haiku/test2</file> <file>platforms/+haiku/test2</file>
<file>platforms/+linux/test2</file> <file>platforms/+linux/test2</file>
<file>platforms/+qnx/test2</file>
<file>platforms/+wince/test2</file> <file>platforms/+wince/test2</file>
<file>platforms/+winnt/test2</file> <file>platforms/+winnt/test2</file>
<file>platforms/+winrt/test2</file> <file>platforms/+winrt/test2</file>

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

@ -86,7 +86,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) && \ #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. /* 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