From 89b5244310d6765f6afd61ea5bd4acc2aed34c3b Mon Sep 17 00:00:00 2001 From: Teemu Katajisto Date: Thu, 22 Mar 2012 13:27:21 +0200 Subject: Cocoa: fix setting color with alpha channel value for color dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Make sure that if ShowAlphaChannel option is set then also setShowsAlpha needs to be set for the panel before setting the current color, otherwise alpha channel value is omitted. Task-number: QTBUG-24320 Change-Id: Ifb3822711af8ffd0cf6cb4c8aab2b0020d296663 Reviewed-by: Morten Johan Sørvig --- tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto') diff --git a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp index ff34b009e9..e6d3e56a43 100644 --- a/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp +++ b/tests/auto/widgets/dialogs/qcolordialog/tst_qcolordialog.cpp @@ -156,9 +156,6 @@ void tst_QColorDialog::task247349_alpha() dialog.setOption(QColorDialog::ShowAlphaChannel, true); int alpha = 0x17; dialog.setCurrentColor(QColor(0x01, 0x02, 0x03, alpha)); -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "Fails on Mac OS X, see QTBUG-24320", Abort); -#endif QCOMPARE(alpha, dialog.currentColor().alpha()); QCOMPARE(alpha, qAlpha(dialog.currentColor().rgba())); } -- cgit v1.2.3