diff options
Diffstat (limited to 'src/corelib/io/qfileselector.cpp')
| -rw-r--r-- | src/corelib/io/qfileselector.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/corelib/io/qfileselector.cpp b/src/corelib/io/qfileselector.cpp index e622f3af0d..42f5610caf 100644 --- a/src/corelib/io/qfileselector.cpp +++ b/src/corelib/io/qfileselector.cpp @@ -295,7 +295,7 @@ void QFileSelectorPrivate::updateSelectors() QLatin1Char pathSep(','); QStringList envSelectors = QString::fromLatin1(qgetenv("QT_FILE_SELECTORS")) .split(pathSep, Qt::SkipEmptyParts); - if (envSelectors.count()) + if (envSelectors.size()) sharedData->staticSelectors << envSelectors; if (!qEnvironmentVariableIsEmpty(env_override)) @@ -318,8 +318,9 @@ QStringList QFileSelectorPrivate::platformSelectors() ret << QSysInfo::kernelType(); // "winnt" #elif defined(Q_OS_UNIX) ret << QStringLiteral("unix"); -# if !defined(Q_OS_ANDROID) && !defined(Q_OS_QNX) +# if !defined(Q_OS_ANDROID) && !defined(Q_OS_QNX) && !defined(Q_OS_VXWORKS) // we don't want "linux" for Android or two instances of "qnx" for QNX + // or two instances of "vxworks" for vxworks ret << QSysInfo::kernelType(); # endif QString productName = QSysInfo::productType(); |