aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/platform/qquickplatformcolordialog.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2016-08-15 14:44:05 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2016-08-15 12:47:42 +0000
commit635062bad91c6d244366567b3118f117bbfeabb0 (patch)
tree50bda3fb489fd501e2569e7f9bee84663938f0af /src/imports/platform/qquickplatformcolordialog.cpp
parent8793cba8aab832a03ed0f608114d83765a02a8ec (diff)
Platform dialogs: respect Qt::AA_DontUseNativeDialogs
Change-Id: I107d51c9e3a874b92c627735dc88c7d296ec799f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src/imports/platform/qquickplatformcolordialog.cpp')
-rw-r--r--src/imports/platform/qquickplatformcolordialog.cpp3
1 files changed, 2 insertions, 1 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)