2 files changed, 17 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp
index 2b7cf8e99f..8866a3e97e 100644
--- a/src/widgets/dialogs/qcolordialog.cpp
+++ b/src/widgets/dialogs/qcolordialog.cpp
@@ -1790,6 +1790,21 @@ void QColorDialogPrivate::retranslateStrings()
     cs->retranslateStrings();
 }
 
+bool QColorDialogPrivate::canBeNativeDialog() const
+{
+    Q_Q(const QColorDialog);
+    if (nativeDialogInUse)
+        return true;
+    if (q->testAttribute(Qt::WA_DontShowOnScreen))
+        return false;
+    if (q->options() & QColorDialog::DontUseNativeDialog)
+        return false;
+
+    QLatin1String staticName(QColorDialog::staticMetaObject.className());
+    QLatin1String dynamicName(q->metaObject()->className());
+    return (staticName == dynamicName);
+}
+
 static const Qt::WindowFlags DefaultWindowFlags =
         Qt::Dialog | Qt::WindowTitleHint | Qt::MSWindowsFixedSizeDialogHint
         | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
diff --git a/src/widgets/dialogs/qcolordialog_p.h b/src/widgets/dialogs/qcolordialog_p.h
index f58a9200db..72c3b0e3cd 100644
--- a/src/widgets/dialogs/qcolordialog_p.h
+++ b/src/widgets/dialogs/qcolordialog_p.h
@@ -110,6 +110,8 @@ public:
     bool handleColorPickingMouseButtonRelease(QMouseEvent *e);
     bool handleColorPickingKeyPress(QKeyEvent *e);
 
+    bool canBeNativeDialog() const;
+
     QWellArray *custom;
     QWellArray *standard;