diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2013-11-07 16:38:31 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-08 11:16:51 +0100 |
| commit | 7a3c82077f909e314cbc685e7ecfc70d08cc42d6 (patch) | |
| tree | fb0bfed88adb3c0618f3dce685e595e84c984095 /src/widgets/dialogs/qcolordialog_p.h | |
| parent | 7a6bb4d9c9eee46e5f2e0aee9a93d38fd6b91c46 (diff) | |
Fix potential BC break in QColorDialog.
Replace newly reimplemented virtuals in
d928dbbc919f5f39af9ce5c69eb8e9ffa9da71d3 .
Task-number: QTBUG-34663
Task-number: QTBUG-14332
Change-Id: Idb2cc2ec237c96f7157470728bb79ff3efc504d0
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src/widgets/dialogs/qcolordialog_p.h')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/dialogs/qcolordialog_p.h b/src/widgets/dialogs/qcolordialog_p.h index 08199cc7c1..f58a9200db 100644 --- a/src/widgets/dialogs/qcolordialog_p.h +++ b/src/widgets/dialogs/qcolordialog_p.h @@ -70,6 +70,7 @@ class QLabel; class QVBoxLayout; class QPushButton; class QWellArray; +class QColorPickingEventFilter; class QColorDialogPrivate : public QDialogPrivate { @@ -105,6 +106,9 @@ public: void _q_newStandard(int, int); void _q_pickScreenColor(); void releaseColorPicking(); + bool handleColorPickingMouseMove(QMouseEvent *e); + bool handleColorPickingMouseButtonRelease(QMouseEvent *e); + bool handleColorPickingKeyPress(QKeyEvent *e); QWellArray *custom; QWellArray *standard; @@ -125,6 +129,7 @@ public: int nextCust; bool smallDisplay; bool screenColorPicking; + QColorPickingEventFilter *colorPickingEventFilter; QRgb beforeScreenColorPicking; QSharedPointer<QColorDialogOptions> options; |