From cc0ad49c75d6cf6b4e63eb8c6012afe55c1589f9 Mon Sep 17 00:00:00 2001 From: tpearson Date: Tue, 15 Feb 2011 19:15:16 +0000 Subject: Allow kdebase to (mostly) function correctly with TQt for Qt4 Fix kicker tackbar handling under Classic mode (thanks to Ilya Chernykh for the patch) Fix a newly invalidated section of code under GCC 4.5.2 (http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47723#c6) git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1220927 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kicker/libkicker/global.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'kicker/libkicker') diff --git a/kicker/libkicker/global.cpp b/kicker/libkicker/global.cpp index 9d1305da3..ee36c9737 100644 --- a/kicker/libkicker/global.cpp +++ b/kicker/libkicker/global.cpp @@ -470,9 +470,8 @@ void drawBlendedRect(TQPainter *p, const TQRect &r, const TQColor &color, int al if (pix.isNull() || last_color != color || last_alpha != alpha) { TQImage img(16, 16, 32); - img.setAlphaBuffer(false); - img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); img.setAlphaBuffer(true); + img.fill(((uint)(alpha & 0xFF) << 24) | (color.rgb() & 0xFFFFFF)); pix.convertFromImage(img); last_color = color; last_alpha = alpha; -- cgit v1.2.1