Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 4 insertions, 4 deletions

diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
index 830b110f2a..08119ce0ae 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
@@ -130,9 +130,9 @@ void QQnxFilePicker::open()
     map[QStringLiteral("AllowOverwrite")] = false;
 
     if (!m_defaultSaveFileNames.isEmpty())
-        map[QStringLiteral("DefaultFileNames")] = m_defaultSaveFileNames.join(",");
+        map[QStringLiteral("DefaultFileNames")] = m_defaultSaveFileNames.join(QLatin1Char(','));
     if (!m_filters.isEmpty())
-        map[QStringLiteral("Filter")] = m_filters.join(";");
+        map[QStringLiteral("Filter")] = m_filters.join(QLatin1Char(';'));
 
     QByteArray ppsData;
 #if defined(Q_OS_BLACKBERRY_TABLET)
@@ -288,8 +288,8 @@ QString QQnxFilePicker::filePickerType() const
     bool video = false;
     bool music = false;
     QMimeDatabase mimeDb;
-    for (int i = 0; i < filters().count(); i++) {
-        QList<QMimeType> mimeTypes = mimeDb.mimeTypesForFileName(filters().at(i));
+    for (int i = 0; i < m_filters.count(); i++) {
+        QList<QMimeType> mimeTypes = mimeDb.mimeTypesForFileName(m_filters.at(i));
         if (mimeTypes.isEmpty())
             return QStringLiteral("Other");