4 files changed, 18 insertions, 9 deletions
diff --git a/src/plugins/platforms/qnx/main.cpp b/src/plugins/platforms/qnx/main.cpp
index fb81928625..50779d3e12 100644
--- a/src/plugins/platforms/qnx/main.cpp
+++ b/src/plugins/platforms/qnx/main.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 QPlatformIntegration *QQnxIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
-    if (system.toLower() == QLatin1String("qnx"))
+    if (!system.compare(QLatin1String("qnx"), Qt::CaseInsensitive))
         return new QQnxIntegration(paramList);
 
     return 0;
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
index e7c68f6ff5..e83fc445d6 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
@@ -87,6 +87,9 @@ public:
 Q_SIGNALS:
     void dialogClosed();
 
+private Q_SLOTS:
+    void emitSignals();
+
 private:
     void setNameFilter(const QString &filter);
     void setNameFilters(const QStringList &filters);
@@ -96,8 +99,8 @@ private:
     QFileDialogOptions::AcceptMode m_acceptMode;
     QString m_selectedFilter;
 
-    QPlatformDialogHelper::DialogCode m_result;
 #if defined(Q_OS_BLACKBERRY_TABLET)
+    QPlatformDialogHelper::DialogCode m_result;
     QList<QUrl> m_paths;
 #endif
 };
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
index dc841eb1a9..fa6e26977a 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
@@ -65,9 +65,9 @@ QQnxFileDialogHelper::QQnxFileDialogHelper(const QQnxIntegration *integration)
       m_integration(integration),
       m_dialog(new QQnxFilePicker),
       m_acceptMode(QFileDialogOptions::AcceptOpen),
-      m_selectedFilter(),
-      m_result(QPlatformDialogHelper::Rejected)
+      m_selectedFilter()
 {
+    connect(m_dialog, &QQnxFilePicker::closed, this, &QQnxFileDialogHelper::emitSignals);
 }
 
 QQnxFileDialogHelper::~QQnxFileDialogHelper()
@@ -85,11 +85,6 @@ void QQnxFileDialogHelper::exec()
     QEventLoop loop;
     connect(m_dialog, SIGNAL(closed()), &loop, SLOT(quit()));
     loop.exec();
-
-    if (m_dialog->selectedFiles().isEmpty())
-        Q_EMIT reject();
-    else
-        Q_EMIT accept();
 }
 
 bool QQnxFileDialogHelper::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent)
@@ -197,6 +192,14 @@ QString QQnxFileDialogHelper::selectedNameFilter() const
     return m_selectedFilter;
 }
 
+void QQnxFileDialogHelper::emitSignals()
+{
+    if (m_dialog->selectedFiles().isEmpty())
+        Q_EMIT reject();
+    else
+        Q_EMIT accept();
+}
+
 void QQnxFileDialogHelper::setNameFilter(const QString &filter)
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO << "filter =" << filter;
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
index 5229d1f1f5..56c804a5b4 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
@@ -84,6 +84,9 @@ void QQnxFilePicker::open()
     if (m_invocationHandle)
         return;
 
+    // Clear any previous results
+    m_selectedFiles.clear();
+
     int errorCode = BPS_SUCCESS;
 
     errorCode = navigator_invoke_invocation_create(&m_invocationHandle);