diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-08-15 14:44:05 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-08-15 12:47:42 +0000 |
| commit | 635062bad91c6d244366567b3118f117bbfeabb0 (patch) | |
| tree | 50bda3fb489fd501e2569e7f9bee84663938f0af | |
| parent | 8793cba8aab832a03ed0f608114d83765a02a8ec (diff) | |
Platform dialogs: respect Qt::AA_DontUseNativeDialogs
Change-Id: I107d51c9e3a874b92c627735dc88c7d296ec799f
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
5 files changed, 9 insertions, 5 deletions
diff --git a/src/imports/platform/qquickplatformcolordialog.cpp b/src/imports/platform/qquickplatformcolordialog.cpp index fd503796..36bb7d69 100644 --- a/src/imports/platform/qquickplatformcolordialog.cpp +++ b/src/imports/platform/qquickplatformcolordialog.cpp @@ -177,7 +177,8 @@ void QQuickPlatformColorDialog::setOptions(QColorDialogOptions::ColorDialogOptio bool QQuickPlatformColorDialog::useNativeDialog() const { - return !m_options->testOption(QColorDialogOptions::DontUseNativeDialog); + return QQuickPlatformDialog::useNativeDialog() + && !m_options->testOption(QColorDialogOptions::DontUseNativeDialog); } void QQuickPlatformColorDialog::onCreate(QPlatformDialogHelper *dialog) diff --git a/src/imports/platform/qquickplatformdialog.cpp b/src/imports/platform/qquickplatformdialog.cpp index 00066d0a..7db2e346 100644 --- a/src/imports/platform/qquickplatformdialog.cpp +++ b/src/imports/platform/qquickplatformdialog.cpp @@ -396,7 +396,7 @@ void QQuickPlatformDialog::destroy() bool QQuickPlatformDialog::useNativeDialog() const { - return true; + return !QCoreApplication::testAttribute(Qt::AA_DontUseNativeDialogs); } void QQuickPlatformDialog::onCreate(QPlatformDialogHelper *dialog) diff --git a/src/imports/platform/qquickplatformfiledialog.cpp b/src/imports/platform/qquickplatformfiledialog.cpp index f0b71bf2..53f91b4c 100644 --- a/src/imports/platform/qquickplatformfiledialog.cpp +++ b/src/imports/platform/qquickplatformfiledialog.cpp @@ -450,7 +450,8 @@ void QQuickPlatformFileDialog::resetRejectLabel() bool QQuickPlatformFileDialog::useNativeDialog() const { - return !m_options->testOption(QFileDialogOptions::DontUseNativeDialog); + return QQuickPlatformDialog::useNativeDialog() + && !m_options->testOption(QFileDialogOptions::DontUseNativeDialog); } void QQuickPlatformFileDialog::onCreate(QPlatformDialogHelper *dialog) diff --git a/src/imports/platform/qquickplatformfolderdialog.cpp b/src/imports/platform/qquickplatformfolderdialog.cpp index f100fbca..1957a5c5 100644 --- a/src/imports/platform/qquickplatformfolderdialog.cpp +++ b/src/imports/platform/qquickplatformfolderdialog.cpp @@ -252,7 +252,8 @@ void QQuickPlatformFolderDialog::resetRejectLabel() bool QQuickPlatformFolderDialog::useNativeDialog() const { - return !m_options->testOption(QFileDialogOptions::DontUseNativeDialog); + return QQuickPlatformDialog::useNativeDialog() + && !m_options->testOption(QFileDialogOptions::DontUseNativeDialog); } void QQuickPlatformFolderDialog::onCreate(QPlatformDialogHelper *dialog) diff --git a/src/imports/platform/qquickplatformfontdialog.cpp b/src/imports/platform/qquickplatformfontdialog.cpp index ae1baa07..edefe645 100644 --- a/src/imports/platform/qquickplatformfontdialog.cpp +++ b/src/imports/platform/qquickplatformfontdialog.cpp @@ -180,7 +180,8 @@ void QQuickPlatformFontDialog::setOptions(QFontDialogOptions::FontDialogOptions bool QQuickPlatformFontDialog::useNativeDialog() const { - return !m_options->testOption(QFontDialogOptions::DontUseNativeDialog); + return QQuickPlatformDialog::useNativeDialog() + && !m_options->testOption(QFontDialogOptions::DontUseNativeDialog); } void QQuickPlatformFontDialog::onCreate(QPlatformDialogHelper *dialog) |