diff options
author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
---|---|---|
committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:22:52 (GMT) |
commit | bcbe1c3438f38087b16465f5b5aeac5d54a42d40 (patch) | |
tree | d939e5eb97c676fd8202595f405bcd8b0170175c /src/gui/dialogs/qcolordialog.cpp | |
parent | 1099908428c594d67fe1da740126f4acfcdc8a0a (diff) | |
parent | c711885b5694a51f0c22908e57e74c60188bd879 (diff) | |
download | Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.zip Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.gz Qt-bcbe1c3438f38087b16465f5b5aeac5d54a42d40.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Diffstat (limited to 'src/gui/dialogs/qcolordialog.cpp')
-rw-r--r-- | src/gui/dialogs/qcolordialog.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp index e06d14a..7e885da 100644 --- a/src/gui/dialogs/qcolordialog.cpp +++ b/src/gui/dialogs/qcolordialog.cpp @@ -1578,10 +1578,11 @@ void QColorDialog::setCurrentColor(const QColor &color) { Q_D(QColorDialog); d->setCurrentColor(color.rgb()); - d->selectColor(color.rgb()); + d->selectColor(color); d->setCurrentAlpha(color.alpha()); #ifdef Q_WS_MAC + d->setCurrentQColor(color); if (d->delegate) QColorDialogPrivate::setColor(d->delegate, color); #endif |