diff options
author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 12:11:58 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-14 10:13:28 +0000 |
commit | 018e051c266413e514f93bcd24a0c783554cfea7 (patch) | |
tree | 8dc64054b39b7d8a4995d259025da1d151aeb042 /src/imports/platform | |
parent | 32382540f8c8cc7808b5c75ea098bda19b92034f (diff) |
Platform: set DontUseNativeDialog on the QtWidgets-based fallbacks
Make sure the widget-based fallback implementation will never call
back to the platform plugin.
Change-Id: I860e61d23a34edcd0a8f85aabbd8d9c86ceac9ad
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/platform')
3 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/platform/widgets/qwidgetplatformcolordialog.cpp b/src/imports/platform/widgets/qwidgetplatformcolordialog.cpp index 68173a1d..88a5f9d3 100644 --- a/src/imports/platform/widgets/qwidgetplatformcolordialog.cpp +++ b/src/imports/platform/widgets/qwidgetplatformcolordialog.cpp @@ -83,7 +83,7 @@ bool QWidgetPlatformColorDialog::show(Qt::WindowFlags flags, Qt::WindowModality QSharedPointer<QColorDialogOptions> options = QPlatformColorDialogHelper::options(); m_dialog->setWindowTitle(options->windowTitle()); - m_dialog->setOptions(static_cast<QColorDialog::ColorDialogOptions>(int(options->options()))); + m_dialog->setOptions(static_cast<QColorDialog::ColorDialogOptions>(int(options->options())) | QColorDialog::DontUseNativeDialog); return QWidgetPlatformDialog::show(m_dialog.data(), flags, modality, parent); } diff --git a/src/imports/platform/widgets/qwidgetplatformfiledialog.cpp b/src/imports/platform/widgets/qwidgetplatformfiledialog.cpp index 22e9c78a..dd25708d 100644 --- a/src/imports/platform/widgets/qwidgetplatformfiledialog.cpp +++ b/src/imports/platform/widgets/qwidgetplatformfiledialog.cpp @@ -132,7 +132,7 @@ bool QWidgetPlatformFileDialog::show(Qt::WindowFlags flags, Qt::WindowModality m m_dialog->setWindowTitle(options->windowTitle()); m_dialog->setAcceptMode(static_cast<QFileDialog::AcceptMode>(options->acceptMode())); m_dialog->setFileMode(static_cast<QFileDialog::FileMode>(options->fileMode())); - m_dialog->setOptions(static_cast<QFileDialog::Options>(int(options->options()))); + m_dialog->setOptions(static_cast<QFileDialog::Options>(int(options->options())) | QFileDialog::DontUseNativeDialog); m_dialog->setNameFilters(options->nameFilters()); m_dialog->setDefaultSuffix(options->defaultSuffix()); if (options->isLabelExplicitlySet(QFileDialogOptions::Accept)) diff --git a/src/imports/platform/widgets/qwidgetplatformfontdialog.cpp b/src/imports/platform/widgets/qwidgetplatformfontdialog.cpp index 7687b74c..4d8b7616 100644 --- a/src/imports/platform/widgets/qwidgetplatformfontdialog.cpp +++ b/src/imports/platform/widgets/qwidgetplatformfontdialog.cpp @@ -83,7 +83,7 @@ bool QWidgetPlatformFontDialog::show(Qt::WindowFlags flags, Qt::WindowModality m QSharedPointer<QFontDialogOptions> options = QPlatformFontDialogHelper::options(); m_dialog->setWindowTitle(options->windowTitle()); - m_dialog->setOptions(static_cast<QFontDialog::FontDialogOptions>(int(options->options()))); + m_dialog->setOptions(static_cast<QFontDialog::FontDialogOptions>(int(options->options())) | QFontDialog::DontUseNativeDialog); return QWidgetPlatformDialog::show(m_dialog.data(), flags, modality, parent); } |