diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dialogs/DefaultColorDialog.qml | 1 | ||||
| -rw-r--r-- | src/dialogs/qquickcolordialog.cpp | 6 | ||||
| -rw-r--r-- | src/dialogs/qquickcolordialog_p.h | 3 |
3 files changed, 9 insertions, 1 deletions
diff --git a/src/dialogs/DefaultColorDialog.qml b/src/dialogs/DefaultColorDialog.qml index 98003b051..1b5f74858 100644 --- a/src/dialogs/DefaultColorDialog.qml +++ b/src/dialogs/DefaultColorDialog.qml @@ -58,7 +58,6 @@ AbstractColorDialog { __valueSet = true } onCurrentColorChanged: __setControlsFromColor() - onSelectionAccepted: root.color = root.currentColor Rectangle { id: content diff --git a/src/dialogs/qquickcolordialog.cpp b/src/dialogs/qquickcolordialog.cpp index d0e0e11b0..58e357205 100644 --- a/src/dialogs/qquickcolordialog.cpp +++ b/src/dialogs/qquickcolordialog.cpp @@ -116,4 +116,10 @@ QQuickColorDialog::~QQuickColorDialog() \l Window or an \l Item. */ +void QQuickColorDialog::accept() +{ + setColor(m_currentColor); + QQuickAbstractColorDialog::accept(); +} + QT_END_NAMESPACE diff --git a/src/dialogs/qquickcolordialog_p.h b/src/dialogs/qquickcolordialog_p.h index ff6953fc0..c6ae69f82 100644 --- a/src/dialogs/qquickcolordialog_p.h +++ b/src/dialogs/qquickcolordialog_p.h @@ -67,6 +67,9 @@ public: explicit QQuickColorDialog(QObject *parent = 0); ~QQuickColorDialog(); +protected Q_SLOTS: + virtual void accept(); + protected: virtual QPlatformColorDialogHelper *helper() { return 0; } |
