From e73d503b84be12e7bf28491356b459ca309e7c95 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Fri, 23 Aug 2013 15:14:33 +0200 Subject: 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 --- src/imports/widgets/qquickqcolordialog.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/imports/widgets') diff --git a/src/imports/widgets/qquickqcolordialog.cpp b/src/imports/widgets/qquickqcolordialog.cpp index d10eacee60..ee27d147e7 100644 --- a/src/imports/widgets/qquickqcolordialog.cpp +++ b/src/imports/widgets/qquickqcolordialog.cpp @@ -163,7 +163,7 @@ QPlatformColorDialogHelper *QQuickQColorDialog::helper() if (!m_dlgHelper) { m_dlgHelper = new QColorDialogHelper(); - connect(m_dlgHelper, SIGNAL(currentColorChanged(const QColor&)), this, SLOT(setColor(QColor))); + connect(m_dlgHelper, SIGNAL(currentColorChanged(const QColor&)), this, SLOT(setCurrentColor(QColor))); connect(m_dlgHelper, SIGNAL(colorSelected(const QColor&)), this, SLOT(setColor(QColor))); connect(m_dlgHelper, SIGNAL(accept()), this, SLOT(accept())); connect(m_dlgHelper, SIGNAL(reject()), this, SLOT(reject())); -- cgit v1.2.3