diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2014-02-11 23:08:48 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 20:12:17 +0100 |
| commit | 1bf9f725d19664e7b28857986acefbfdb2b12162 (patch) | |
| tree | 1a762949f766c3a4fbbc7a3808484fddcc714813 /src/widgets/dialogs/qcolordialog_p.h | |
| parent | f42bd772f8110dba13d209d81d8eed0077772185 (diff) | |
Respect the DontUseNativeDialog option for QColorDialog
By reimplementing canBeNativeDialog() we ensure it is only shown
natively if the circumstances are correct. The change was modelled on
how QFileDialog implements the same checks.
Change-Id: If58e33d6d0547e95975d7c0453901fa592eb96a0
[ChangeLog][QtWidgets][QColorDialog] Ensured
QColorDialog::DontUseNativeDialog is respected when showing the dialog.
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets/dialogs/qcolordialog_p.h')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
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; |