diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2013-08-23 15:14:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-17 07:36:09 +0200 |
| commit | e73d503b84be12e7bf28491356b459ca309e7c95 (patch) | |
| tree | 854ded45f1d75032b5cc3feb78600acc5483f1f2 /src/imports/widgets | |
| parent | 77ee9ab37e81b4e593dec73428d584013d6e8574 (diff) | |
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>
Diffstat (limited to 'src/imports/widgets')
| -rw-r--r-- | src/imports/widgets/qquickqcolordialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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())); |