Add currentColor property to ColorDialog.

QColorDialog has this property. This patch effectively means that
the color property will be set when the dialog closes, instead of
whenever the current color in the dialog changes, so pressing cancel
will revert the color to what it was before the dialog was opened.

[ChangeLog][QtDeclarative][ColorDialog] Added currentColor property.

Change-Id: I2ef6b32954342cd2469cf1552d53f9e2fbf3420b
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/imports/dialogs/qquickabstractcolordialog.cpp b/src/imports/dialogs/qquickabstractcolordialog.cpp
index d565352af6..abac997ca6 100644
--- a/src/imports/dialogs/qquickabstractcolordialog.cpp
+++ b/src/imports/dialogs/qquickabstractcolordialog.cpp
@@ -109,6 +109,15 @@ void QQuickAbstractColorDialog::setColor(QColor arg)
         m_color = arg;
         emit colorChanged();
     }
+    setCurrentColor(arg);
+}
+
+void QQuickAbstractColorDialog::setCurrentColor(QColor currentColor)
+{
+    if (m_currentColor != currentColor) {
+        m_currentColor = currentColor;
+        emit currentColorChanged();
+    }
 }
 
 void QQuickAbstractColorDialog::setShowAlphaChannel(bool arg)