1 |
dilfridge 11/04/27 22:12:47 |
2 |
|
3 |
Added: kalarm-4.4.11.1-crash.patch |
4 |
Log: |
5 |
Added upstream patch against a crash, bug 365139 |
6 |
|
7 |
(Portage version: 2.1.9.46/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/kalarm/files/kalarm-4.4.11.1-crash.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: kalarm-4.4.11.1-crash.patch |
16 |
=================================================================== |
17 |
diff --git a/kalarm/lib/spinbox2.cpp b/kalarm/lib/spinbox2.cpp |
18 |
index cc10882..f1e8ab9 100644 |
19 |
--- a/kalarm/lib/spinbox2.cpp |
20 |
+++ b/kalarm/lib/spinbox2.cpp |
21 |
@@ -1,7 +1,7 @@ |
22 |
/* |
23 |
* spinbox2.cpp - spin box with extra pair of spin buttons (for Qt 3) |
24 |
* Program: kalarm |
25 |
- * Copyright © 2001-2009 by David Jarvie <djarvie@×××.org> |
26 |
+ * Copyright © 2001-2009,2011 by David Jarvie <djarvie@×××.org> |
27 |
* |
28 |
* This program is free software; you can redistribute it and/or modify |
29 |
* it under the terms of the GNU General Public License as published by |
30 |
@@ -28,7 +28,7 @@ |
31 |
#include <QMouseEvent> |
32 |
#include <QStyleOptionSpinBox> |
33 |
#include <QGraphicsPixmapItem> |
34 |
-#include <QPaintEngine> |
35 |
+#include <QPainter> |
36 |
#include <QTimer> |
37 |
#include <QFrame> |
38 |
#include <QBrush> |
39 |
@@ -588,8 +588,9 @@ void SpinMirror::setFrame() |
40 |
p = grabWidget(mMainSpinbox, QRect(x, 0, 1, height())); |
41 |
// Blot out edit field stuff from the middle of the slice |
42 |
QPixmap dot = grabWidget(mMainSpinbox, QRect(x, editOffsetY, 1, 1)); |
43 |
- QPaintEngine* pe = p.paintEngine(); |
44 |
- pe->drawTiledPixmap(QRectF(0, editOffsetY, 1, height() - 2*editOffsetY), dot, QPointF(0, 0)); |
45 |
+ QPainter painter(&p); |
46 |
+ painter.drawTiledPixmap(0, editOffsetY, 1, height() - 2*editOffsetY, dot, 0, 0); |
47 |
+ painter.end(); |
48 |
// Horizontally fill the mirror widget with the vertical slice |
49 |
p = p.scaled(size()); |
50 |
// Grab the left hand border of the main spinbox, and draw it into the mirror widget. |