diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-01-30 16:52:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-31 18:27:43 +0100 |
| commit | 4dcb607aa96e8a5d05b483236417e171bbe06ff6 (patch) | |
| tree | 9bca47574d47462c36c5e273c69fe31b9d75aacb /src/widgets/dialogs | |
| parent | 8d38c0f6d6732762d6f0394880e96a6b2628b05a (diff) | |
QColorDialog: Emit done after setting the selected color.
Task-number: QTBUG-35859
Change-Id: I8b23d0283e9678c6698c174d0362cf8d85b2f813
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/widgets/dialogs')
| -rw-r--r-- | src/widgets/dialogs/qcolordialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 9323e84599..2b7cf8e99f 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -2192,13 +2192,13 @@ bool QColorDialogPrivate::handleColorPickingKeyPress(QKeyEvent *e) void QColorDialog::done(int result) { Q_D(QColorDialog); - QDialog::done(result); if (result == Accepted) { d->selectedQColor = d->currentQColor(); emit colorSelected(d->selectedQColor); } else { d->selectedQColor = QColor(); } + QDialog::done(result); if (d->receiverToDisconnectOnClose) { disconnect(this, SIGNAL(colorSelected(QColor)), d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose); |