diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 13:56:35 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 12:07:41 +0000 |
| commit | ba2f7169656f2b3f6b04f8965b43811ff3cb4bd8 (patch) | |
| tree | 8cfbcc59a0c0ab35a5a851e06b66ef5178b0e0e3 /src/imports | |
| parent | 6a3a9ad3f983f3daf5494b6f67bc6802cb252e51 (diff) | |
Platform dialogs: respect (undocumented) DontUseNativeDialog
Change-Id: I56ad5025fb873261ccd96e82e4c9fff0731ddf92
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports')
4 files changed, 12 insertions, 4 deletions
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp index ed6b9a56..d7fbbfff 100644 --- a/src/imports/platform/qquickplatformcolordialog.cpp +++ b/src/imports/platform/qquickplatformcolordialog.cpp @@ -186,7 +186,9 @@ void QQuickPlatformColorDialog::setOptions(QColorDialogOptions::ColorDialogOptio QPlatformDialogHelper *QQuickPlatformColorDialog::createHelper() { - QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::ColorDialog); + QPlatformDialogHelper *dialog = nullptr; + if (!m_options->testOption(QColorDialogOptions::DontUseNativeDialog)) + dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::ColorDialog); #ifdef QT_WIDGETS_LIB if (!dialog) dialog = new QWidgetPlatformColorDialog(this); diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp index d46a1aac..1cf25d73 100644 --- a/src/imports/platform/qquickplatformfiledialog.cpp +++ b/src/imports/platform/qquickplatformfiledialog.cpp @@ -458,7 +458,9 @@ void QQuickPlatformFileDialog::resetRejectLabel() QPlatformDialogHelper *QQuickPlatformFileDialog::createHelper() { - QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FileDialog); + QPlatformDialogHelper *dialog = nullptr; + if (!m_options->testOption(QFileDialogOptions::DontUseNativeDialog)) + dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FileDialog); #ifdef QT_WIDGETS_LIB if (!dialog) dialog = new QWidgetPlatformFileDialog(this); diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp index 29a7bf0d..81a60190 100644 --- a/src/imports/platform/qquickplatformfolderdialog.cpp +++ b/src/imports/platform/qquickplatformfolderdialog.cpp @@ -261,7 +261,9 @@ void QQuickPlatformFolderDialog::resetRejectLabel() QPlatformDialogHelper *QQuickPlatformFolderDialog::createHelper() { - QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FileDialog); + QPlatformDialogHelper *dialog = nullptr; + if (!m_options->testOption(QFileDialogOptions::DontUseNativeDialog)) + dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FileDialog); #ifdef QT_WIDGETS_LIB if (!dialog) dialog = new QWidgetPlatformFileDialog(this); diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp index bd7b1b06..3ca4304d 100644 --- a/src/imports/platform/qquickplatformfontdialog.cpp +++ b/src/imports/platform/qquickplatformfontdialog.cpp @@ -189,7 +189,9 @@ void QQuickPlatformFontDialog::setOptions(QFontDialogOptions::FontDialogOptions QPlatformDialogHelper *QQuickPlatformFontDialog::createHelper() { - QPlatformDialogHelper *dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FontDialog); + QPlatformDialogHelper *dialog = nullptr; + if (!m_options->testOption(QFontDialogOptions::DontUseNativeDialog)) + dialog = QGuiApplicationPrivate::platformTheme()->createPlatformDialogHelper(QPlatformTheme::FontDialog); #ifdef QT_WIDGETS_LIB if (!dialog) dialog = new QWidgetPlatformFontDialog(this); |