Gentoo Archives: gentoo-commits

From: "Alex Alexander (wired)" <wired@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-themes/qtcurve-qt4/files: qtcurve-qt4-1.1.1-no-kde-fail.patch
Date: Fri, 26 Feb 2010 14:12:10
Message-Id: E1Nl0vH-0007nW-LH@stork.gentoo.org
1 wired 10/02/26 14:12:07
2
3 Added: qtcurve-qt4-1.1.1-no-kde-fail.patch
4 Log:
5 [x11-themes/qtcurve-qt4] version bump
6 (Portage version: 2.2_rc63/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.1-no-kde-fail.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.1-no-kde-fail.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-themes/qtcurve-qt4/files/qtcurve-qt4-1.1.1-no-kde-fail.patch?rev=1.1&content-type=text/plain
13
14 Index: qtcurve-qt4-1.1.1-no-kde-fail.patch
15 ===================================================================
16 --- style/qtcurve.cpp.old 2010-02-26 16:06:50.280829619 +0200
17 +++ style/qtcurve.cpp 2010-02-26 16:07:31.224827593 +0200
18 @@ -7451,9 +7451,8 @@
19
20 opt.state=State_Horizontal|State_Enabled|State_Raised|(active ? State_Active : State_None);
21
22 -#ifdef QTC_QT_ONLY
23 - QPainterPath path;
24 -#elif KDE_IS_VERSION(4, 3, 0)
25 +#ifndef QTC_QT_ONLY
26 + #if KDE_IS_VERSION(4, 3, 0)
27 QPainterPath path(opts.round<ROUND_SLIGHT
28 ? QPainterPath()
29 : buildPath(QRectF(state&QtC_StateKWinNoBorder ? r : r.adjusted(1, 1, -1, 0)),
30 @@ -7462,6 +7461,9 @@
31 (opts.round>ROUND_SLIGHT /*&& kwin*/
32 ? 6.0
33 : 2.0)-(state&QtC_StateKWinNoBorder ? 0.0 : 1.0)));
34 + #else
35 + QPainterPath path;
36 + #endif
37 #else
38 QPainterPath path;
39 #endif