From 687fed8c198a6a35b4e43f4993027e4a62470fe6 Mon Sep 17 00:00:00 2001
From: Markus Goetz <Markus.Goetz@nokia.com>
Date: Wed, 24 Jun 2009 11:41:53 +0200
Subject: QColorDialog: Fix setting of alpha values

When alpha was changed and then another color was picked in the GUI
still the old alpha remained (good) but it was not returned in
the returned color (bad).

Task-number: 256164
Reviewed-by: jasplin
---
 src/gui/dialogs/qcolordialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/dialogs/qcolordialog.cpp b/src/gui/dialogs/qcolordialog.cpp
index b2aaf1d..510c0c4 100644
--- a/src/gui/dialogs/qcolordialog.cpp
+++ b/src/gui/dialogs/qcolordialog.cpp
@@ -1262,7 +1262,7 @@ void QColorShower::retranslateStrings()
 void QColorShower::updateQColor()
 {
     QColor oldQColor(curQColor);
-    curQColor.setRgba(qRgba(qRed(curCol), qGreen(curCol), qBlue(curCol), qAlpha(curCol)));
+    curQColor.setRgba(qRgba(qRed(curCol), qGreen(curCol), qBlue(curCol), currentAlpha()));
     if (curQColor != oldQColor)
         emit currentColorChanged(curQColor);
 }
-- 
cgit v0.12