diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2014-01-31 16:04:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-03 12:11:42 +0100 |
| commit | 0bbb32469adb3c49b110e2eb987caba58da80554 (patch) | |
| tree | db8ed19c27f6c30b1a962c6944ce55041cc7cb7a /src | |
| parent | 9267bd4e2f52e22f73b37e6a8d974b8eaa51f85d (diff) | |
ColorDialog: color property must be up-to-date before accepted()
Followup to e73d503b84be12e7bf28491356b459ca309e7c95 in
qtdeclarative: setCurrentColor replaced the calls to setColor, so
now it's necessary to call setColor when the dialog is being
accepted.
Task-number: QTBUG-36312
Change-Id: I38c1b7bf830ee1472bbab697668dec2db80e283c
Reviewed-by: Liang Qi <liang.qi@digia.com>
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; } |