diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-02 15:35:18 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-04 01:54:02 +0100 |
commit | 720093ebd915d81d9cd24bd36a9d3bacfefa059b (patch) | |
tree | 51f2ffb410444e531cbee5aaa2bd03d1ef2c78b2 /src/widgets/dialogs/qfiledialog.cpp | |
parent | 24971fbef0c8ad5c8a01b3eaf829f10a14899a1a (diff) | |
download | qtbase-720093ebd915d81d9cd24bd36a9d3bacfefa059b.tar.gz |
QWidgets: Delayed creation of the QPlatformDialogHelper.
- Create helper only once and ensure deletion
- Move nativeDialogInUse into QDialogPrivate, ensuring the native
modal helper is called from QDialog::exec() only if it is true
Change-Id: Id92b278bb051ce254458f276fbf7075689a7d491
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/widgets/dialogs/qfiledialog.cpp')
-rw-r--r-- | src/widgets/dialogs/qfiledialog.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/widgets/dialogs/qfiledialog.cpp b/src/widgets/dialogs/qfiledialog.cpp index 4c0d50f55b..9b7c525c8b 100644 --- a/src/widgets/dialogs/qfiledialog.cpp +++ b/src/widgets/dialogs/qfiledialog.cpp @@ -516,7 +516,6 @@ QFileDialogPrivate::QFileDialogPrivate() useDefaultCaption(true), defaultFileTypes(true), fileNameLabelExplicitlySat(false), - nativeDialogInUse(false), qFileDialogUi(0) { } @@ -2223,10 +2222,6 @@ void QFileDialogPrivate::init(const QString &directory, const QString &nameFilte const QString &caption) { Q_Q(QFileDialog); - platformHelper = QGuiApplicationPrivate::platformIntegration()->createPlatformDialogHelper(q); - if (platformHelper) - platformHelper->d_ptr = this; - if (!caption.isEmpty()) { useDefaultCaption = false; setWindowTitle = caption; @@ -2273,8 +2268,8 @@ void QFileDialogPrivate::createWidgets() Q_Q(QFileDialog); model = new QFileSystemModel(q); model->setObjectName(QLatin1String("qt_filesystem_model")); - if (platformHelper) - model->setNameFilterDisables(platformHelper->defaultNameFilterDisables()); + if (QPlatformDialogHelper *helper = platformHelper()) + model->setNameFilterDisables(helper->defaultNameFilterDisables()); else model->setNameFilterDisables(false); model->d_func()->disableRecursiveSort = true; @@ -3130,8 +3125,8 @@ void QFileDialogPrivate::_q_fileRenamed(const QString &path, const QString oldNa void QFileDialogPrivate::_q_platformRunNativeAppModalPanel() { - if (platformHelper) - platformHelper->_q_platformRunNativeAppModalPanel(); + if (nativeDialogInUse) + platformHelper()->_q_platformRunNativeAppModalPanel(); } /*! |