Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-all.patch') (more/less context) (show whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all.patch | 237 |
1 files changed, 65 insertions, 172 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all.patch b/qt/qt-2.3.7.patch/qte237-all.patch index cb09109..596db2f 100644 --- a/qt/qt-2.3.7.patch/qte237-all.patch +++ b/qt/qt-2.3.7.patch/qte237-all.patch | |||
@@ -1,94 +1,8 @@ | |||
1 | diff -ru qt-2.3.5_fresh/include/qapplication.h qt-2.3.5/include/qapplication.h | ||
2 | --- qt-2.3.5_fresh/include/qapplication.h2003-05-13 15:56:10.000000000 +0200 | ||
3 | +++ qt-2.3.5/include/qapplication.h2003-05-13 15:58:18.000000000 +0200 | ||
4 | @@ -61,6 +61,10 @@ | ||
5 | class QSemaphore; | ||
6 | #endif | ||
7 | 1 | ||
8 | +#if !defined( QT_WEAK_SYMBOL ) | 2 | # |
9 | +#define QT_WEAK_SYMBOL | 3 | # Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher |
10 | +#endif | 4 | # |
11 | + | ||
12 | // REMOVE IN 3.0 (just here for moc source compatibility) | ||
13 | #define QNonBaseApplication QApplication | ||
14 | |||
15 | @@ -85,7 +89,10 @@ | ||
16 | |||
17 | #ifndef QT_NO_STYLE | ||
18 | static QStyle &style(); | ||
19 | - static void setStyle( QStyle* ); | ||
20 | + static void setStyle( QStyle* ) QT_WEAK_SYMBOL; | ||
21 | +private: | ||
22 | +static void setStyle_NonWeak( QStyle* ); | ||
23 | +public: | ||
24 | #endif | ||
25 | #if 1/* OBSOLETE */ | ||
26 | enum ColorMode { NormalColors, CustomColors }; | ||
27 | @@ -106,11 +113,19 @@ | ||
28 | #ifndef QT_NO_PALETTE | ||
29 | static QPalette palette( const QWidget* = 0 ); | ||
30 | static void setPalette( const QPalette &, bool informWidgets=FALSE, | ||
31 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
32 | +private: | ||
33 | + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, | ||
34 | const char* className = 0 ); | ||
35 | +public: | ||
36 | #endif | ||
37 | static QFont font( const QWidget* = 0 ); | ||
38 | static void setFont( const QFont &, bool informWidgets=FALSE, | ||
39 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
40 | +private: | ||
41 | + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, | ||
42 | const char* className = 0 ); | ||
43 | +public: | ||
44 | static QFontMetrics fontMetrics(); | ||
45 | 5 | ||
46 | QWidget *mainWidget() const; | 6 | --- qt-2.3.7/src/kernel/qapplication.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 |
47 | @@ -207,7 +222,10 @@ | 7 | +++ qt-2.3.7/src/kernel/qapplication.cpp2004-04-15 21:06:51.232857014 +0200 |
48 | void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); | ||
49 | #ifndef QT_NO_QWS_MANAGER | ||
50 | static QWSDecoration &qwsDecoration(); | ||
51 | - static void qwsSetDecoration( QWSDecoration *); | ||
52 | + static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; | ||
53 | +private: | ||
54 | + static void qwsSetDecoration_NonWeak( QWSDecoration *); | ||
55 | +public: | ||
56 | #endif | ||
57 | #endif | ||
58 | |||
59 | diff -ru qt-2.3.5_fresh/include/qfontdatabase.h qt-2.3.5/include/qfontdatabase.h | ||
60 | --- qt-2.3.5_fresh/include/qfontdatabase.h2003-05-13 15:56:11.000000000 +0200 | ||
61 | +++ qt-2.3.5/include/qfontdatabase.h2003-05-13 15:58:18.000000000 +0200 | ||
62 | @@ -59,6 +59,10 @@ | ||
63 | class QDiskFont; | ||
64 | #endif | ||
65 | |||
66 | +#if !defined( QT_WEAK_SYMBOL ) | ||
67 | +#define QT_WEAK_SYMBOL | ||
68 | +#endif | ||
69 | + | ||
70 | class QFontDatabasePrivate; | ||
71 | |||
72 | class Q_EXPORT QFontDatabase | ||
73 | @@ -67,9 +71,16 @@ | ||
74 | QFontDatabase(); | ||
75 | |||
76 | QStringList families( bool onlyForLocale = TRUE ) const; | ||
77 | + | ||
78 | + | ||
79 | QValueList<int> pointSizes( const QString &family, | ||
80 | const QString &style = QString::null, | ||
81 | - const QString &charSet = QString::null ); | ||
82 | + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; | ||
83 | +private: | ||
84 | + QValueList<int> pointSizes_NonWeak( const QString &family, | ||
85 | + const QString &style, | ||
86 | + const QString &charSet ); | ||
87 | +public: | ||
88 | QStringList styles( const QString &family, | ||
89 | const QString &charSet = QString::null ) const; | ||
90 | QStringList charSets( const QString &familyName, | ||
91 | diff -ru qt-2.3.5_fresh/src/kernel/qapplication.cpp qt-2.3.5/src/kernel/qapplication.cpp | ||
92 | --- qt-2.3.5_fresh/src/kernel/qapplication.cpp2003-05-13 15:56:10.000000000 +0200 | ||
93 | +++ qt-2.3.5/src/kernel/qapplication.cpp2003-05-13 15:58:19.000000000 +0200 | ||
94 | @@ -35,6 +35,8 @@ | 8 | @@ -35,6 +35,8 @@ |
@@ -175,6 +89,4 @@ diff -ru qt-2.3.5_fresh/src/kernel/qapplication.cpp qt-2.3.5/src/kernel/qapplica | |||
175 | if ( !app_font ) { | 89 | if ( !app_font ) { |
176 | Nur in qt-2.3.5/src/kernel: qapplication.cpp.orig. | 90 | --- qt-2.3.7/src/kernel/qapplication.h~qte237-all2003-07-17 03:20:25.000000000 +0200 |
177 | diff -ru qt-2.3.5_fresh/src/kernel/qapplication.h qt-2.3.5/src/kernel/qapplication.h | 91 | +++ qt-2.3.7/src/kernel/qapplication.h2004-04-15 21:06:51.232857014 +0200 |
178 | --- qt-2.3.5_fresh/src/kernel/qapplication.h2003-05-13 15:56:10.000000000 +0200 | ||
179 | +++ qt-2.3.5/src/kernel/qapplication.h2003-05-13 15:58:18.000000000 +0200 | ||
180 | @@ -61,6 +61,10 @@ | 92 | @@ -61,6 +61,10 @@ |
@@ -234,6 +146,5 @@ diff -ru qt-2.3.5_fresh/src/kernel/qapplication.h qt-2.3.5/src/kernel/qapplicati | |||
234 | 146 | ||
235 | diff -ru qt-2.3.5_fresh/src/kernel/qapplication_qws.cpp qt-2.3.5/src/kernel/qapplication_qws.cpp | 147 | --- qt-2.3.7/src/kernel/qapplication_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 |
236 | --- qt-2.3.5_fresh/src/kernel/qapplication_qws.cpp2003-05-13 15:56:10.000000000 +0200 | 148 | +++ qt-2.3.7/src/kernel/qapplication_qws.cpp2004-04-15 21:06:51.234856703 +0200 |
237 | +++ qt-2.3.5/src/kernel/qapplication_qws.cpp2003-05-13 15:58:18.000000000 +0200 | 149 | @@ -2804,6 +2804,11 @@ |
238 | @@ -2737,6 +2737,11 @@ | ||
239 | */ | 150 | */ |
@@ -249,6 +160,4 @@ diff -ru qt-2.3.5_fresh/src/kernel/qapplication_qws.cpp qt-2.3.5/src/kernel/qapp | |||
249 | qws_decoration = d; | 160 | qws_decoration = d; |
250 | Nur in qt-2.3.5/src/kernel: qapplication_qws.cpp.orig. | 161 | --- qt-2.3.7/src/kernel/qfontdatabase.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 |
251 | diff -ru qt-2.3.5_fresh/src/kernel/qfontdatabase.cpp qt-2.3.5/src/kernel/qfontdatabase.cpp | 162 | +++ qt-2.3.7/src/kernel/qfontdatabase.cpp2004-04-15 21:06:51.235856547 +0200 |
252 | --- qt-2.3.5_fresh/src/kernel/qfontdatabase.cpp2003-05-13 15:56:11.000000000 +0200 | ||
253 | +++ qt-2.3.5/src/kernel/qfontdatabase.cpp2003-05-13 15:58:18.000000000 +0200 | ||
254 | @@ -35,6 +35,8 @@ | 163 | @@ -35,6 +35,8 @@ |
@@ -276,5 +185,4 @@ diff -ru qt-2.3.5_fresh/src/kernel/qfontdatabase.cpp qt-2.3.5/src/kernel/qfontda | |||
276 | QStringList lst = charSets( family ); | 185 | QStringList lst = charSets( family ); |
277 | diff -ru qt-2.3.5_fresh/src/kernel/qfontdatabase.h qt-2.3.5/src/kernel/qfontdatabase.h | 186 | --- qt-2.3.7/src/kernel/qfontdatabase.h~qte237-all2003-07-17 03:20:25.000000000 +0200 |
278 | --- qt-2.3.5_fresh/src/kernel/qfontdatabase.h2003-05-13 15:56:11.000000000 +0200 | 187 | +++ qt-2.3.7/src/kernel/qfontdatabase.h2004-04-15 21:06:51.236856392 +0200 |
279 | +++ qt-2.3.5/src/kernel/qfontdatabase.h2003-05-13 15:58:18.000000000 +0200 | ||
280 | @@ -59,6 +59,10 @@ | 188 | @@ -59,6 +59,10 @@ |
@@ -308,6 +216,5 @@ diff -ru qt-2.3.5_fresh/src/kernel/qfontdatabase.h qt-2.3.5/src/kernel/qfontdata | |||
308 | QStringList charSets( const QString &familyName, | 216 | QStringList charSets( const QString &familyName, |
309 | diff -ru qt-2.3.5_fresh/src/kernel/qgfxraster_qws.cpp qt-2.3.5/src/kernel/qgfxraster_qws.cpp | 217 | --- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 |
310 | --- qt-2.3.5_fresh/src/kernel/qgfxraster_qws.cpp2003-05-13 15:56:11.000000000 +0200 | 218 | +++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp2004-04-15 21:06:51.238856081 +0200 |
311 | +++ qt-2.3.5/src/kernel/qgfxraster_qws.cpp2003-05-13 15:58:18.000000000 +0200 | 219 | @@ -4237,7 +4237,7 @@ |
312 | @@ -4205,7 +4205,7 @@ | ||
313 | setAlphaType(IgnoreAlpha); | 220 | setAlphaType(IgnoreAlpha); |
@@ -320,7 +227,5 @@ diff -ru qt-2.3.5_fresh/src/kernel/qgfxraster_qws.cpp qt-2.3.5/src/kernel/qgfxra | |||
320 | 227 | ||
321 | Nur in qt-2.3.5/src/kernel: qgfxraster_qws.cpp.orig. | 228 | --- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 |
322 | diff -ru qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp qt-2.3.5/src/kernel/qwindowsystem_qws.cpp | 229 | +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp2004-04-15 21:06:51.240855770 +0200 |
323 | --- qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:56:11.000000000 +0200 | 230 | @@ -844,6 +844,18 @@ |
324 | +++ qt-2.3.5/src/kernel/qwindowsystem_qws.cpp2003-05-13 15:58:19.000000000 +0200 | ||
325 | @@ -843,6 +843,18 @@ | ||
326 | { | 231 | { |
@@ -343,3 +248,3 @@ diff -ru qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp qt-2.3.5/src/kernel/qwi | |||
343 | \brief Server-specific functionality in Qt/Embedded | 248 | \brief Server-specific functionality in Qt/Embedded |
344 | @@ -912,6 +924,7 @@ | 249 | @@ -936,6 +948,7 @@ |
345 | } | 250 | } |
@@ -351,5 +256,4 @@ diff -ru qt-2.3.5_fresh/src/kernel/qwindowsystem_qws.cpp qt-2.3.5/src/kernel/qwi | |||
351 | mouseGrabber = 0; | 256 | mouseGrabber = 0; |
352 | diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommonstyle.cpp | 257 | --- qt-2.3.7/src/widgets/qcommonstyle.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 |
353 | --- qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp2003-05-13 15:56:12.000000000 +0200 | 258 | +++ qt-2.3.7/src/widgets/qcommonstyle.cpp2004-04-15 21:06:51.240855770 +0200 |
354 | +++ qt-2.3.5/src/widgets/qcommonstyle.cpp2003-05-13 15:58:19.000000000 +0200 | ||
355 | @@ -566,7 +566,7 @@ | 259 | @@ -566,7 +566,7 @@ |
@@ -363,6 +267,4 @@ diff -ru qt-2.3.5_fresh/src/widgets/qcommonstyle.cpp qt-2.3.5/src/widgets/qcommo | |||
363 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 267 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); |
364 | Nur in qt-2.3.5/src/widgets: qcommonstyle.cpp.orig. | 268 | --- qt-2.3.7/src/widgets/qlistview.cpp~qte237-all2003-07-17 03:20:26.000000000 +0200 |
365 | diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview.cpp | 269 | +++ qt-2.3.7/src/widgets/qlistview.cpp2004-04-15 21:06:51.243855303 +0200 |
366 | --- qt-2.3.5_fresh/src/widgets/qlistview.cpp2003-05-13 15:56:12.000000000 +0200 | ||
367 | +++ qt-2.3.5/src/widgets/qlistview.cpp2003-05-13 15:58:18.000000000 +0200 | ||
368 | @@ -4968,9 +4968,9 @@ | 270 | @@ -4968,9 +4968,9 @@ |
@@ -380,5 +282,4 @@ diff -ru qt-2.3.5_fresh/src/widgets/qlistview.cpp qt-2.3.5/src/widgets/qlistview | |||
380 | s.setHeight( s.width() / 3 ); | 282 | s.setHeight( s.width() / 3 ); |
381 | diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbutton.cpp | 283 | --- qt-2.3.7/src/widgets/qtoolbutton.cpp~qte237-all2003-07-17 03:20:27.000000000 +0200 |
382 | --- qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp2003-05-13 15:56:12.000000000 +0200 | 284 | +++ qt-2.3.7/src/widgets/qtoolbutton.cpp2004-04-15 21:06:51.243855303 +0200 |
383 | +++ qt-2.3.5/src/widgets/qtoolbutton.cpp2003-05-13 15:58:18.000000000 +0200 | ||
384 | @@ -230,7 +230,7 @@ | 285 | @@ -230,7 +230,7 @@ |
@@ -410,4 +311,4 @@ diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbu | |||
410 | h = pm.height(); | 311 | h = pm.height(); |
411 | --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~c7xxrotate2003-07-16 18:20:25.000000000 -0700 | 312 | --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 |
412 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2003-12-07 15:54:10.000000000 -0800 | 313 | +++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp2004-04-15 21:06:51.244855148 +0200 |
413 | @@ -238,7 +238,7 @@ | 314 | @@ -238,7 +238,7 @@ |
@@ -421,5 +322,4 @@ diff -ru qt-2.3.5_fresh/src/widgets/qtoolbutton.cpp qt-2.3.5/src/widgets/qtoolbu | |||
421 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 | 322 | { Qt::Key_unknown,0xffff , 0xffff , 0xffff }, // 69 |
422 | diff -ru qt-2.3.7/configs/linux-generic-g++-shared qte/configs/linux-generic-g++-shared | 323 | --- qt-2.3.7/configs/linux-generic-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200 |
423 | --- qt-2.3.7/configs/linux-generic-g++-shared2003-07-17 03:23:08.000000000 +0200 | 324 | +++ qt-2.3.7/configs/linux-generic-g++-shared2004-04-15 21:06:51.244855148 +0200 |
424 | +++ qte/configs/linux-generic-g++-shared2004-03-01 20:08:00.884254576 +0100 | ||
425 | @@ -36,7 +36,7 @@ | 325 | @@ -36,7 +36,7 @@ |
@@ -433,6 +333,4 @@ diff -ru qt-2.3.7/configs/linux-generic-g++-shared qte/configs/linux-generic-g++ | |||
433 | 333 | ||
434 | Nur in qte/configs: linux-generic-g++-shared~. | 334 | --- qt-2.3.7/configs/linux-generic-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 |
435 | diff -ru qt-2.3.7/configs/linux-generic-g++-shared-debug qte/configs/linux-generic-g++-shared-debug | 335 | +++ qt-2.3.7/configs/linux-generic-g++-shared-debug2004-04-15 21:06:51.244855148 +0200 |
436 | --- qt-2.3.7/configs/linux-generic-g++-shared-debug2003-07-17 03:23:08.000000000 +0200 | ||
437 | +++ qte/configs/linux-generic-g++-shared-debug2004-03-01 20:08:06.552392888 +0100 | ||
438 | @@ -36,7 +36,7 @@ | 336 | @@ -36,7 +36,7 @@ |
@@ -446,6 +344,4 @@ diff -ru qt-2.3.7/configs/linux-generic-g++-shared-debug qte/configs/linux-gener | |||
446 | 344 | ||
447 | Nur in qte/configs: linux-generic-g++-shared-debug~. | 345 | --- qt-2.3.7/configs/linux-generic-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200 |
448 | diff -ru qt-2.3.7/configs/linux-generic-g++-static qte/configs/linux-generic-g++-static | 346 | +++ qt-2.3.7/configs/linux-generic-g++-static2004-04-15 21:06:51.244855148 +0200 |
449 | --- qt-2.3.7/configs/linux-generic-g++-static2003-07-17 03:23:08.000000000 +0200 | ||
450 | +++ qte/configs/linux-generic-g++-static2004-03-01 20:08:11.410654320 +0100 | ||
451 | @@ -36,7 +36,7 @@ | 347 | @@ -36,7 +36,7 @@ |
@@ -459,6 +355,4 @@ diff -ru qt-2.3.7/configs/linux-generic-g++-static qte/configs/linux-generic-g++ | |||
459 | 355 | ||
460 | Nur in qte/configs: linux-generic-g++-static~. | 356 | --- qt-2.3.7/configs/linux-generic-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 |
461 | diff -ru qt-2.3.7/configs/linux-generic-g++-static-debug qte/configs/linux-generic-g++-static-debug | 357 | +++ qt-2.3.7/configs/linux-generic-g++-static-debug2004-04-15 21:06:51.245854992 +0200 |
462 | --- qt-2.3.7/configs/linux-generic-g++-static-debug2003-07-17 03:23:08.000000000 +0200 | ||
463 | +++ qte/configs/linux-generic-g++-static-debug2004-03-01 20:08:15.780989928 +0100 | ||
464 | @@ -36,7 +36,7 @@ | 358 | @@ -36,7 +36,7 @@ |
@@ -472,6 +366,4 @@ diff -ru qt-2.3.7/configs/linux-generic-g++-static-debug qte/configs/linux-gener | |||
472 | 366 | ||
473 | Nur in qte/configs: linux-generic-g++-static-debug~. | 367 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared~qte237-all2003-07-17 03:23:08.000000000 +0200 |
474 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared qte/configs/linux-generic_rtti-g++-shared | 368 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared2004-04-15 21:06:51.245854992 +0200 |
475 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared2003-07-17 03:23:08.000000000 +0200 | ||
476 | +++ qte/configs/linux-generic_rtti-g++-shared2004-03-01 20:08:20.393288752 +0100 | ||
477 | @@ -36,7 +36,7 @@ | 369 | @@ -36,7 +36,7 @@ |
@@ -485,6 +377,4 @@ diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared qte/configs/linux-generi | |||
485 | 377 | ||
486 | Nur in qte/configs: linux-generic_rtti-g++-shared~. | 378 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 |
487 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug qte/configs/linux-generic_rtti-g++-shared-debug | 379 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2004-04-15 21:06:51.245854992 +0200 |
488 | --- qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug2003-07-17 03:23:08.000000000 +0200 | ||
489 | +++ qte/configs/linux-generic_rtti-g++-shared-debug2004-03-01 20:08:25.127569032 +0100 | ||
490 | @@ -36,7 +36,7 @@ | 380 | @@ -36,7 +36,7 @@ |
@@ -498,6 +388,4 @@ diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug qte/configs/linux- | |||
498 | 388 | ||
499 | Nur in qte/configs: linux-generic_rtti-g++-shared-debug~. | 389 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static~qte237-all2003-07-17 03:23:08.000000000 +0200 |
500 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static qte/configs/linux-generic_rtti-g++-static | 390 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static2004-04-15 21:06:51.245854992 +0200 |
501 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static2003-07-17 03:23:08.000000000 +0200 | ||
502 | +++ qte/configs/linux-generic_rtti-g++-static2004-03-01 20:08:29.727869680 +0100 | ||
503 | @@ -36,7 +36,7 @@ | 391 | @@ -36,7 +36,7 @@ |
@@ -511,6 +399,4 @@ diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static qte/configs/linux-generi | |||
511 | 399 | ||
512 | Nur in qte/configs: linux-generic_rtti-g++-static~. | 400 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug~qte237-all2003-07-17 03:23:08.000000000 +0200 |
513 | diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static-debug qte/configs/linux-generic_rtti-g++-static-debug | 401 | +++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2004-04-15 21:06:51.245854992 +0200 |
514 | --- qt-2.3.7/configs/linux-generic_rtti-g++-static-debug2003-07-17 03:23:08.000000000 +0200 | ||
515 | +++ qte/configs/linux-generic_rtti-g++-static-debug2004-03-01 20:06:12.806684864 +0100 | ||
516 | @@ -36,7 +36,7 @@ | 402 | @@ -36,7 +36,7 @@ |
@@ -524,6 +410,4 @@ diff -ru qt-2.3.7/configs/linux-generic_rtti-g++-static-debug qte/configs/linux- | |||
524 | 410 | ||
525 | Nur in qte/configs: linux-generic_rtti-g++-static-debug~. | 411 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared~qte237-all2003-07-17 03:23:10.000000000 +0200 |
526 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared qte/configs/linux-x86rtti-g++-shared | 412 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared2004-04-15 21:06:51.245854992 +0200 |
527 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared2003-07-17 03:23:10.000000000 +0200 | ||
528 | +++ qte/configs/linux-x86rtti-g++-shared2004-03-01 19:54:16.977507440 +0100 | ||
529 | @@ -36,7 +36,7 @@ | 413 | @@ -36,7 +36,7 @@ |
@@ -537,5 +421,4 @@ diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared qte/configs/linux-x86rtti-g++ | |||
537 | 421 | ||
538 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared-debug qte/configs/linux-x86rtti-g++-shared-debug | 422 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug~qte237-all2003-07-17 03:23:10.000000000 +0200 |
539 | --- qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2003-07-17 03:23:10.000000000 +0200 | 423 | +++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug2004-04-15 21:06:51.245854992 +0200 |
540 | +++ qte/configs/linux-x86rtti-g++-shared-debug2004-03-01 19:54:24.064430064 +0100 | ||
541 | @@ -36,7 +36,7 @@ | 424 | @@ -36,7 +36,7 @@ |
@@ -549,5 +432,4 @@ diff -ru qt-2.3.7/configs/linux-x86rtti-g++-shared-debug qte/configs/linux-x86rt | |||
549 | 432 | ||
550 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static qte/configs/linux-x86rtti-g++-static | 433 | --- qt-2.3.7/configs/linux-x86rtti-g++-static~qte237-all2003-07-17 03:23:10.000000000 +0200 |
551 | --- qt-2.3.7/configs/linux-x86rtti-g++-static2003-07-17 03:23:10.000000000 +0200 | 434 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static2004-04-15 21:06:51.246854837 +0200 |
552 | +++ qte/configs/linux-x86rtti-g++-static2004-03-01 19:54:32.020220600 +0100 | ||
553 | @@ -36,7 +36,7 @@ | 435 | @@ -36,7 +36,7 @@ |
@@ -561,5 +443,4 @@ diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static qte/configs/linux-x86rtti-g++ | |||
561 | 443 | ||
562 | diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static-debug qte/configs/linux-x86rtti-g++-static-debug | 444 | --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug~qte237-all2003-07-17 03:23:10.000000000 +0200 |
563 | --- qt-2.3.7/configs/linux-x86rtti-g++-static-debug2003-07-17 03:23:10.000000000 +0200 | 445 | +++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug2004-04-15 21:06:51.246854837 +0200 |
564 | +++ qte/configs/linux-x86rtti-g++-static-debug2004-03-01 19:54:41.434789368 +0100 | ||
565 | @@ -36,7 +36,7 @@ | 446 | @@ -36,7 +36,7 @@ |
@@ -572 +453,13 @@ diff -ru qt-2.3.7/configs/linux-x86rtti-g++-static-debug qte/configs/linux-x86rt | |||
572 | SYSCONF_LIBS = -lm | 453 | SYSCONF_LIBS = -lm |
454 | |||
455 | --- qt-2.3.7/src/kernel/qimage.cpp~qte237-all2003-07-17 03:20:25.000000000 +0200 | ||
456 | +++ qt-2.3.7/src/kernel/qimage.cpp2004-04-15 21:07:23.293869923 +0200 | ||
457 | @@ -2201,7 +2201,7 @@ | ||
458 | t2 = srcHeight * dstWidth; | ||
459 | |||
460 | if (((sModeQStr == "ScaleMin") && (t1 > t2)) || | ||
461 | - ((sModeQStr == "ScaleMax") && (t2 < t2))) { | ||
462 | + ((sModeQStr == "ScaleMax") && (t1 < t2))) { | ||
463 | dstHeight = t2 / srcWidth; | ||
464 | } else if (sModeQStr != "ScaleFree") { | ||
465 | dstWidth = t1 / srcHeight; | ||