From 4dcb607aa96e8a5d05b483236417e171bbe06ff6 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Thu, 30 Jan 2014 16:52:42 +0100
Subject: [PATCH] QColorDialog: Emit done after setting the selected color.

Task-number: QTBUG-35859
Change-Id: I8b23d0283e9678c6698c174d0362cf8d85b2f813
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
---
 src/widgets/dialogs/qcolordialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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);