1 --- /tmp/qapplication_p.h 2008-07-14 11:39:24.000000000 +0200
2 +++ qt-embedded-linux-opensource-src-4.4.0/src/gui/kernel/qapplication_p.h 2008-07-14 11:39:47.000000000 +0200
5 QRect maxWindowRect(const QScreen *screen) const { return maxWindowRects[screen]; }
6 void setMaxWindowRect(const QScreen *screen, int screenNo, const QRect &rect);
7 - void setScreenTransformation(QScreen *screen, int screen, int transformation);
8 + void setScreenTransformation(QScreen *screen, int screenNo, int transformation);
11 static QApplicationPrivate *instance() { return self; }
12 --- /tmp/qdrawhelper_p.h 2008-07-14 11:48:26.000000000 +0200
13 +++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper_p.h 2008-07-14 11:50:12.000000000 +0200
15 static inline quint32 qt_convertToRgb(SRC color);
18 -static inline quint32 qt_convertToRgb(quint32 color)
19 +inline quint32 qt_convertToRgb(quint32 color)
21 const int r = qRed(color) >> (8 - qrgb::len_red);
22 const int g = qGreen(color) >> (8 - qrgb::len_green);
27 -static inline quint32 qt_convertToRgb(quint16 color)
28 +inline quint32 qt_convertToRgb(quint16 color)
30 return qt_convertToRgb(qt_colorConvert<quint32, quint16>(color, 0));
32 @@ -1422,14 +1422,14 @@
36 -static inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy)
37 +inline qrgb_generic16 qt_colorConvert(quint32 color, qrgb_generic16 dummy)
40 return qrgb_generic16(color);
44 -static inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy)
45 +inline qrgb_generic16 qt_colorConvert(quint16 color, qrgb_generic16 dummy)
48 return qrgb_generic16(qt_colorConvert<quint32, quint16>(color, 0));
49 --- /tmp/qscreen_qws.cpp 2008-07-14 11:51:39.000000000 +0200
50 +++ qt-embedded-linux-opensource-src-4.4.0/src/gui/embedded/qscreen_qws.cpp 2008-07-14 11:52:56.000000000 +0200
52 static inline quint8 qt_convertToGray4(SRC color);
55 -static inline quint8 qt_convertToGray4(quint32 color)
56 +inline quint8 qt_convertToGray4(quint32 color)
58 return qGray(color) >> 4;
62 -static inline quint8 qt_convertToGray4(quint16 color)
63 +inline quint8 qt_convertToGray4(quint16 color)
65 const int r = (color & 0xf800) >> 11;
66 const int g = (color & 0x07e0) >> 6; // only keep 5 bit
71 -static inline quint8 qt_convertToGray4(qrgb444 color)
72 +inline quint8 qt_convertToGray4(qrgb444 color)
74 return qt_convertToGray4(quint32(color));
78 -static inline quint8 qt_convertToGray4(qargb4444 color)
79 +inline quint8 qt_convertToGray4(qargb4444 color)
81 return qt_convertToGray4(quint32(color));
84 static inline quint8 qt_convertToMono(SRC color);
87 -static inline quint8 qt_convertToMono(quint32 color)
88 +inline quint8 qt_convertToMono(quint32 color)
90 return qGray(color) >> 7;
94 -static inline quint8 qt_convertToMono(quint16 color)
95 +inline quint8 qt_convertToMono(quint16 color)
97 return (qGray(qt_colorConvert<quint32, quint16>(color, 0)) >> 7);
101 -static inline quint8 qt_convertToMono(qargb4444 color)
102 +inline quint8 qt_convertToMono(qargb4444 color)
104 return (qGray(quint32(color)) >> 7);
108 -static inline quint8 qt_convertToMono(qrgb444 color)
109 +inline quint8 qt_convertToMono(qrgb444 color)
111 return (qGray(quint32(color)) >> 7);
113 --- /tmp/qdrawhelper.cpp 2008-07-14 11:56:25.000000000 +0200
114 +++ qt-embedded-linux-opensource-src-4.4.0/src/gui/painting/qdrawhelper.cpp 2008-07-14 11:57:29.000000000 +0200
115 @@ -3374,7 +3374,7 @@
117 #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
119 -static inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src)
120 +inline void madd_4(qargb8565 *dest, const quint32 a, const qargb8565 *src)
122 Q_ASSERT((quintptr(dest) & 0x3) == 0);
123 Q_ASSERT((quintptr(src) & 0x3) == 0);
124 @@ -3455,7 +3455,7 @@
126 #if Q_BYTE_ORDER == Q_LITTLE_ENDIAN
128 -static inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src)
129 +inline void madd_4(qargb8555 *dest, const quint32 a, const qargb8555 *src)
131 Q_ASSERT((quintptr(dest) & 0x3) == 0);
132 Q_ASSERT((quintptr(src) & 0x3) == 0);