3 files changed, 3 insertions, 13 deletions
diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp
index 4a9fa1cf70..8adebf6050 100644
--- a/src/widgets/dialogs/qdialog.cpp
+++ b/src/widgets/dialogs/qdialog.cpp
@@ -199,14 +199,6 @@ QVariant QDialogPrivate::styleHint(QPlatformDialogHelper::StyleHint hint) const
     return QPlatformDialogHelper::defaultStyleHint(hint);
 }
 
-void QDialogPrivate::deletePlatformHelper()
-{
-    delete m_platformHelper;
-    m_platformHelper = nullptr;
-    m_platformHelperCreated = false;
-    nativeDialogInUse = false;
-}
-
 /*!
     \class QDialog
     \brief The QDialog class is the base class of dialog windows.
diff --git a/src/widgets/dialogs/qdialog_p.h b/src/widgets/dialogs/qdialog_p.h
index 803007d554..28b5bc16b6 100644
--- a/src/widgets/dialogs/qdialog_p.h
+++ b/src/widgets/dialogs/qdialog_p.h
@@ -54,7 +54,6 @@ public:
     QWindow *transientParentWindow() const;
     bool setNativeDialogVisible(bool visible);
     QVariant styleHint(QPlatformDialogHelper::StyleHint hint) const;
-    void deletePlatformHelper();
 
 #if QT_CONFIG(pushbutton)
     QPointer<QPushButton> mainDef;
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp
index d301eaa7ea..e2f81c22a1 100644
--- a/src/widgets/dialogs/qfiledialog.cpp
+++ b/src/widgets/dialogs/qfiledialog.cpp
@@ -531,7 +531,6 @@ void QFileDialogPrivate::initHelper(QPlatformDialogHelper *h)
     QObject::connect(h, SIGNAL(directoryEntered(QUrl)), d, SLOT(_q_nativeEnterDirectory(QUrl)));
     QObject::connect(h, SIGNAL(filterSelected(QString)), d, SIGNAL(filterSelected(QString)));
     static_cast<QPlatformFileDialogHelper *>(h)->setOptions(options);
-    nativeDialogInUse = true;
 }
 
 void QFileDialogPrivate::helperPrepareShow(QPlatformDialogHelper *)
@@ -765,8 +764,10 @@ void QFileDialog::setOptions(Options options)
 
     d->options->setOptions(QFileDialogOptions::FileDialogOptions(int(options)));
 
-    if ((options & DontUseNativeDialog) && !d->usingWidgets())
+    if (options & DontUseNativeDialog) {
+        d->nativeDialogInUse = false;
         d->createWidgets();
+    }
 
     if (d->usingWidgets()) {
         if (changed & DontResolveSymlinks)
@@ -2963,8 +2964,6 @@ void QFileDialogPrivate::createWidgets()
         model->setNameFilterDisables(helper->defaultNameFilterDisables());
     else
         model->setNameFilterDisables(false);
-    if (nativeDialogInUse)
-        deletePlatformHelper();
     model->d_func()->disableRecursiveSort = true;
     QFileDialog::connect(model, SIGNAL(fileRenamed(QString,QString,QString)), q, SLOT(_q_fileRenamed(QString,QString,QString)));
     QFileDialog::connect(model, SIGNAL(rootPathChanged(QString)),