summaryrefslogtreecommitdiff
authoreilers <eilers>2003-11-17 16:04:15 (UTC)
committer eilers <eilers>2003-11-17 16:04:15 (UTC)
commitd7bc4cb1af3ef107b3acc30fb6b4da36b7bdffea (patch) (unidiff)
tree78c58ab76e7244fb72eb02c8b5bdcf30e5c66741
parent74a1afb21424a4f69c7a01fda2cc517daf69fd82 (diff)
downloadopie-d7bc4cb1af3ef107b3acc30fb6b4da36b7bdffea.zip
opie-d7bc4cb1af3ef107b3acc30fb6b4da36b7bdffea.tar.gz
opie-d7bc4cb1af3ef107b3acc30fb6b4da36b7bdffea.tar.bz2
Panther patches included
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all-macosx.patch448
1 files changed, 64 insertions, 384 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all-macosx.patch b/qt/qt-2.3.7.patch/qte237-all-macosx.patch
index 82ed530..d1b3fdc 100644
--- a/qt/qt-2.3.7.patch/qte237-all-macosx.patch
+++ b/qt/qt-2.3.7.patch/qte237-all-macosx.patch
@@ -1,10 +1,10 @@
1diff -ru qte-2.3.7_orig/include/qapplication.h qte-2.3.7/include/qapplication.h 1diff -ru qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h
2 --- qte-2.3.7_orig/include/qapplication.hThu Jul 17 03:20:25 2003 2 --- qt-2.3.7/include/qapplication.hThu Jul 17 03:20:25 2003
3 +++ qte-2.3.7/include/qapplication.hMon Oct 27 14:21:28 2003 3 +++ qte-2.3.7/include/qapplication.hMon Oct 27 14:21:28 2003
4@@ -61,6 +61,10 @@ 4@@ -61,6 +61,10 @@
5 class QSemaphore; 5 class QSemaphore;
6 #endif 6 #endif
7 7
8+#if !defined( QT_WEAK_SYMBOL ) 8+#if !defined( QT_WEAK_SYMBOL )
9+#define QT_WEAK_SYMBOL 9+#define QT_WEAK_SYMBOL
10+#endif 10+#endif
@@ -51,20 +51,19 @@ diff -ru qte-2.3.7_orig/include/qapplication.h qte-2.3.7/include/qapplication.h
51- static void qwsSetDecoration( QWSDecoration *); 51- static void qwsSetDecoration( QWSDecoration *);
52+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 52+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
53+private: 53+private:
54+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 54+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
55+public: 55+public:
56 #endif 56 #endif
57 #endif 57 #endif
58 58
59Only in qte-2.3.7/include: qconfig-qpe.h 59diff -ru qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h
60diff -ru qte-2.3.7_orig/include/qconfig.h qte-2.3.7/include/qconfig.h 60 --- qt-2.3.7/include/qconfig.hFri Jan 26 14:43:06 2001
61 --- qte-2.3.7_orig/include/qconfig.hFri Jan 26 14:43:06 2001 61 +++ qte-2.3.7/include/qconfig.hSun Nov 16 13:35:10 2003
62 +++ qte-2.3.7/include/qconfig.hWed Oct 29 22:13:16 2003
63@@ -1,3 +1,26 @@ 62@@ -1,3 +1,26 @@
64+// Copied from qconfig-qpe.h 63+// Copied from qconfig-qpe.h
65+/********************************************************************** 64+/**********************************************************************
66+** Copyright (C) 2000 Trolltech AS. All rights reserved. 65+** Copyright (C) 2000 Trolltech AS. All rights reserved.
67+** 66+**
68+** This file is part of Qtopia Environment. 67+** This file is part of Qtopia Environment.
69+** 68+**
70+** This file may be distributed and/or modified under the terms of the 69+** This file may be distributed and/or modified under the terms of the
@@ -82,17 +81,17 @@ diff -ru qte-2.3.7_orig/include/qconfig.h qte-2.3.7/include/qconfig.h
82+** 81+**
83+**********************************************************************/ 82+**********************************************************************/
84+#ifndef QT_H 83+#ifndef QT_H
85+#endif // QT_H 84+#endif // QT_H
86+ 85+
87 // Empty leaves all features enabled. See doc/html/features.html for choices. 86 // Empty leaves all features enabled. See doc/html/features.html for choices.
88 87
89 // Note that disabling some features will produce a libqt that is not 88 // Note that disabling some features will produce a libqt that is not
90@@ -8,3 +31,69 @@ 89@@ -8,3 +31,71 @@
91 #ifndef QT_DLL 90 #ifndef QT_DLL
92 #define QT_DLL // Internal 91 #define QT_DLL // Internal
93 #endif 92 #endif
94+ 93+
95+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) 94+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
96+# define QT_NO_QWS_CURSOR 95+# define QT_NO_QWS_CURSOR
97+# define QT_NO_QWS_MOUSE_AUTO 96+# define QT_NO_QWS_MOUSE_AUTO
98+#endif 97+#endif
@@ -152,18 +151,21 @@ diff -ru qte-2.3.7_orig/include/qconfig.h qte-2.3.7/include/qconfig.h
152+ 151+
153+//#define QT_NO_QWS_SAVEFONTS 152+//#define QT_NO_QWS_SAVEFONTS
154+//#define QT_NO_QWS_PROPERTIES 153+//#define QT_NO_QWS_PROPERTIES
155+ 154+
156+#define QT_NO_QWS_BEOS_WM_STYLE 155+#define QT_NO_QWS_BEOS_WM_STYLE
157+#define QT_NO_QWS_KDE2_WM_STYLE 156+#define QT_NO_QWS_KDE2_WM_STYLE
158+#define QT_NO_QWS_KDE_WM_STYLE 157+#define QT_NO_QWS_KDE_WM_STYLE
159+#define QT_NO_QWS_WINDOWS_WM_STYLE 158+#define QT_NO_QWS_WINDOWS_WM_STYLE
160diff -ru qte-2.3.7_orig/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h 159+
161 --- qte-2.3.7_orig/include/qfontdatabase.hThu Jul 17 03:20:25 2003 160+#define QT_NO_SOUND
161\ No newline at end of file
162diff -ru qt-2.3.7/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h
163 --- qt-2.3.7/include/qfontdatabase.hThu Jul 17 03:20:25 2003
162 +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003 164 +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003
163@@ -59,6 +59,10 @@ 165@@ -59,6 +59,10 @@
164 class QDiskFont; 166 class QDiskFont;
165 #endif 167 #endif
166 168
167+#if !defined( QT_WEAK_SYMBOL ) 169+#if !defined( QT_WEAK_SYMBOL )
168+#define QT_WEAK_SYMBOL 170+#define QT_WEAK_SYMBOL
169+#endif 171+#endif
@@ -184,20 +186,19 @@ diff -ru qte-2.3.7_orig/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.
184+private: 186+private:
185+ QValueList<int> pointSizes_NonWeak( const QString &family, 187+ QValueList<int> pointSizes_NonWeak( const QString &family,
186 + const QString &style, 188 + const QString &style,
187 + const QString &charSet ); 189 + const QString &charSet );
188+public: 190+public:
189 QStringList styles( const QString &family, 191 QStringList styles( const QString &family,
190 const QString &charSet = QString::null ) const; 192 const QString &charSet = QString::null ) const;
191 QStringList charSets( const QString &familyName, 193 QStringList charSets( const QString &familyName,
192Only in qte-2.3.7_orig/include: qgifimageformat_p.h 194diff -ru qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h
193diff -ru qte-2.3.7_orig/include/qmodules.h qte-2.3.7/include/qmodules.h 195 --- qt-2.3.7/include/qmodules.hFri Aug 31 17:00:56 2001
194 --- qte-2.3.7_orig/include/qmodules.hFri Aug 31 17:00:56 2001 196 +++ qte-2.3.7/include/qmodules.hSun Nov 16 13:34:58 2003
195 +++ qte-2.3.7/include/qmodules.hWed Oct 29 21:57:53 2003
196@@ -1,14 +1,12 @@ 197@@ -1,14 +1,12 @@
197-#ifndef QT_H 198-#ifndef QT_H
198-#endif // QT_H 199-#endif // QT_H
199- 200-
200+// These modules are licensed to you 201+// These modules are licensed to you
201 #define QT_MODULE_TOOLS 202 #define QT_MODULE_TOOLS
202 #define QT_MODULE_KERNEL 203 #define QT_MODULE_KERNEL
203 #define QT_MODULE_WIDGETS 204 #define QT_MODULE_WIDGETS
@@ -207,84 +208,18 @@ diff -ru qte-2.3.7_orig/include/qmodules.h qte-2.3.7/include/qmodules.h
207 #define QT_MODULE_WORKSPACE 208 #define QT_MODULE_WORKSPACE
208-#define QT_MODULE_TABLE 209-#define QT_MODULE_TABLE
209+#define QT_MODULE_NETWORK 210+#define QT_MODULE_NETWORK
210 #define QT_MODULE_CANVAS 211 #define QT_MODULE_CANVAS
211+#define QT_MODULE_TABLE 212+#define QT_MODULE_TABLE
212 #define QT_MODULE_XML 213 #define QT_MODULE_XML
213-#define QT_MODULE_NETWORK 214-#define QT_MODULE_NETWORK
214+#define QT_MODULE_OPENGL 215+#define QT_MODULE_OPENGL
215Only in qte-2.3.7_orig/include: qxt.h 216diff -ru qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp
216Only in qte-2.3.7/lib: libqte.dylib 217 --- qt-2.3.7/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003
217Only in qte-2.3.7/lib: libqte.dylib.2
218Only in qte-2.3.7/lib: libqte.dylib.2.3
219Only in qte-2.3.7/lib: libqte.dylib.2.3.7
220Only in qte-2.3.7/src/3rdparty/kernel: qgifimageformat.o
221Only in qte-2.3.7/src/3rdparty/kernel: qpointarray.o
222Only in qte-2.3.7/src/3rdparty/kernel: qpolygonscanner.o
223Only in qte-2.3.7/src/3rdparty/kernel: qregion_qws.o
224Only in qte-2.3.7/src/3rdparty/libpng: png.o
225Only in qte-2.3.7/src/3rdparty/libpng: pngerror.o
226Only in qte-2.3.7/src/3rdparty/libpng: pngget.o
227Only in qte-2.3.7/src/3rdparty/libpng: pngmem.o
228Only in qte-2.3.7/src/3rdparty/libpng: pngpread.o
229Only in qte-2.3.7/src/3rdparty/libpng: pngread.o
230Only in qte-2.3.7/src/3rdparty/libpng: pngrio.o
231Only in qte-2.3.7/src/3rdparty/libpng: pngrtran.o
232Only in qte-2.3.7/src/3rdparty/libpng: pngrutil.o
233Only in qte-2.3.7/src/3rdparty/libpng: pngset.o
234Only in qte-2.3.7/src/3rdparty/libpng: pngtrans.o
235Only in qte-2.3.7/src/3rdparty/libpng: pngwio.o
236Only in qte-2.3.7/src/3rdparty/libpng: pngwrite.o
237Only in qte-2.3.7/src/3rdparty/libpng: pngwtran.o
238Only in qte-2.3.7/src/3rdparty/libpng: pngwutil.o
239Only in qte-2.3.7/src/3rdparty/tools: qbig5codec.o
240Only in qte-2.3.7/src/3rdparty/tools: qeucjpcodec.o
241Only in qte-2.3.7/src/3rdparty/tools: qeuckrcodec.o
242Only in qte-2.3.7/src/3rdparty/tools: qgbkcodec.o
243Only in qte-2.3.7/src/3rdparty/tools: qjiscodec.o
244Only in qte-2.3.7/src/3rdparty/tools: qjpunicode.o
245Only in qte-2.3.7/src/3rdparty/tools: qrtlcodec.o
246Only in qte-2.3.7/src/3rdparty/tools: qsjiscodec.o
247Only in qte-2.3.7/src/3rdparty/tools: qtsciicodec.o
248Only in qte-2.3.7/src/3rdparty/zlib: Makefile
249Only in qte-2.3.7/src/3rdparty/zlib: adler32.o
250Only in qte-2.3.7/src/3rdparty/zlib: compress.o
251Only in qte-2.3.7/src/3rdparty/zlib: crc32.o
252Only in qte-2.3.7/src/3rdparty/zlib: deflate.o
253Only in qte-2.3.7/src/3rdparty/zlib: gzio.o
254Only in qte-2.3.7/src/3rdparty/zlib: infblock.o
255Only in qte-2.3.7/src/3rdparty/zlib: infcodes.o
256Only in qte-2.3.7/src/3rdparty/zlib: inffast.o
257Only in qte-2.3.7/src/3rdparty/zlib: inflate.o
258Only in qte-2.3.7/src/3rdparty/zlib: inftrees.o
259Only in qte-2.3.7/src/3rdparty/zlib: infutil.o
260Only in qte-2.3.7/src/3rdparty/zlib: trees.o
261Only in qte-2.3.7/src/3rdparty/zlib: uncompr.o
262Only in qte-2.3.7/src/3rdparty/zlib: zutil.o
263Only in qte-2.3.7/src: Makefile
264Only in qte-2.3.7/src: allmoc.cpp
265Only in qte-2.3.7/src: allmoc.o
266Only in qte-2.3.7/src/canvas: qcanvas.o
267Only in qte-2.3.7/src/dialogs: qcolordialog.moc
268Only in qte-2.3.7/src/dialogs: qcolordialog.o
269Only in qte-2.3.7/src/dialogs: qfiledialog.moc
270Only in qte-2.3.7/src/dialogs: qfiledialog.o
271Only in qte-2.3.7/src/dialogs: qfontdialog.o
272Only in qte-2.3.7/src/dialogs: qinputdialog.o
273Only in qte-2.3.7/src/dialogs: qmessagebox.o
274Only in qte-2.3.7/src/dialogs: qprintdialog.o
275Only in qte-2.3.7/src/dialogs: qprogressdialog.o
276Only in qte-2.3.7/src/dialogs: qtabdialog.o
277Only in qte-2.3.7/src/dialogs: qwizard.o
278Only in qte-2.3.7/src/iconview: qiconview.o
279Only in qte-2.3.7/src/kernel: qabstractlayout.o
280Only in qte-2.3.7/src/kernel: qaccel.o
281diff -ru qte-2.3.7_orig/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp
282 --- qte-2.3.7_orig/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003
283 +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003 218 +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003
284@@ -35,6 +35,8 @@ 219@@ -35,6 +35,8 @@
285 ** 220 **
286 **********************************************************************/ 221 **********************************************************************/
287 222
288 +#define QT_WEAK_SYMBOL__attribute__(( weak )) 223 +#define QT_WEAK_SYMBOL__attribute__(( weak ))
289+ 224+
290 #include "qobjectlist.h" 225 #include "qobjectlist.h"
@@ -358,18 +293,18 @@ diff -ru qte-2.3.7_orig/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplic
358+{ 293+{
359 +setFont_NonWeak ( font, informWidgets, className ); 294 +setFont_NonWeak ( font, informWidgets, className );
360+} 295+}
361+ 296+
362+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, 297+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets,
363 const char* className ) 298 const char* className )
364 { 299 {
365 bool all = FALSE; 300 bool all = FALSE;
366diff -ru qte-2.3.7_orig/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h 301diff -ru qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h
367 --- qte-2.3.7_orig/src/kernel/qapplication.hThu Jul 17 03:20:25 2003 302 --- qt-2.3.7/src/kernel/qapplication.hThu Jul 17 03:20:25 2003
368 +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003 303 +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003
369@@ -61,6 +61,10 @@ 304@@ -61,6 +61,10 @@
370 class QSemaphore; 305 class QSemaphore;
371 #endif 306 #endif
372 307
373+#if !defined( QT_WEAK_SYMBOL ) 308+#if !defined( QT_WEAK_SYMBOL )
374+#define QT_WEAK_SYMBOL 309+#define QT_WEAK_SYMBOL
375+#endif 310+#endif
@@ -416,59 +351,33 @@ diff -ru qte-2.3.7_orig/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplicat
416- static void qwsSetDecoration( QWSDecoration *); 351- static void qwsSetDecoration( QWSDecoration *);
417+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 352+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
418+private: 353+private:
419+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 354+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
420+public: 355+public:
421 #endif 356 #endif
422 #endif 357 #endif
423 358
424Only in qte-2.3.7/src/kernel: qapplication.o 359diff -ru qt-2.3.7/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp
425diff -ru qte-2.3.7_orig/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp 360 --- qt-2.3.7/src/kernel/qapplication_qws.cppThu Jul 17 03:20:25 2003
426 --- qte-2.3.7_orig/src/kernel/qapplication_qws.cppThu Jul 17 03:20:25 2003
427 +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003 361 +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003
428@@ -2804,6 +2804,11 @@ 362@@ -2804,6 +2804,11 @@
429 */ 363 */
430 void QApplication::qwsSetDecoration( QWSDecoration *d ) 364 void QApplication::qwsSetDecoration( QWSDecoration *d )
431 { 365 {
432 +qwsSetDecoration_NonWeak ( d ); 366 +qwsSetDecoration_NonWeak ( d );
433+} 367+}
434+ 368+
435+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) 369+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
436+{ 370+{
437 if ( d ) { 371 if ( d ) {
438 delete qws_decoration; 372 delete qws_decoration;
439 qws_decoration = d; 373 qws_decoration = d;
440Only in qte-2.3.7/src/kernel: qapplication_qws.cpp~ 374diff -ru qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp
441Only in qte-2.3.7/src/kernel: qapplication_qws.o 375 --- qt-2.3.7/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003
442Only in qte-2.3.7/src/kernel: qasyncimageio.o
443Only in qte-2.3.7/src/kernel: qasyncio.o
444Only in qte-2.3.7/src/kernel: qbitmap.o
445Only in qte-2.3.7/src/kernel: qclipboard.o
446Only in qte-2.3.7/src/kernel: qclipboard_qws.o
447Only in qte-2.3.7/src/kernel: qcolor.o
448Only in qte-2.3.7/src/kernel: qcolor_p.o
449Only in qte-2.3.7/src/kernel: qcolor_qws.o
450Only in qte-2.3.7/src/kernel: qconnection.o
451Only in qte-2.3.7/src/kernel: qcopchannel_qws.moc
452Only in qte-2.3.7/src/kernel: qcopchannel_qws.o
453Only in qte-2.3.7/src/kernel: qcursor.o
454Only in qte-2.3.7/src/kernel: qcursor_qws.o
455Only in qte-2.3.7/src/kernel: qdialog.o
456Only in qte-2.3.7/src/kernel: qdirectpainter_qws.o
457Only in qte-2.3.7/src/kernel: qdnd_qws.o
458Only in qte-2.3.7/src/kernel: qdragobject.o
459Only in qte-2.3.7/src/kernel: qdrawutil.o
460Only in qte-2.3.7/src/kernel: qdropsite.o
461Only in qte-2.3.7/src/kernel: qevent.o
462Only in qte-2.3.7/src/kernel: qfocusdata.o
463Only in qte-2.3.7/src/kernel: qfont.o
464Only in qte-2.3.7/src/kernel: qfont_qws.o
465diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp
466 --- qte-2.3.7_orig/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003
467 +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003 376 +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003
468@@ -35,6 +35,8 @@ 377@@ -35,6 +35,8 @@
469 ** 378 **
470 **********************************************************************/ 379 **********************************************************************/
471 380
472+#define QT_WEAK_SYMBOL __attribute__(( weak )) 381+#define QT_WEAK_SYMBOL __attribute__(( weak ))
473+ 382+
474 #include "qfontdatabase.h" 383 #include "qfontdatabase.h"
@@ -483,18 +392,18 @@ diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontd
483+{ 392+{
484 +return pointSizes_NonWeak ( family, style, charSet ); 393 +return pointSizes_NonWeak ( family, style, charSet );
485+} 394+}
486+ 395+
487+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, 396+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
488 const QString &style, 397 const QString &style,
489 const QString &charSet ) 398 const QString &charSet )
490 { 399 {
491diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h 400diff -ru qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h
492 --- qte-2.3.7_orig/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003 401 --- qt-2.3.7/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003
493 +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003 402 +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003
494@@ -59,6 +59,10 @@ 403@@ -59,6 +59,10 @@
495 class QDiskFont; 404 class QDiskFont;
496 #endif 405 #endif
497 406
498+#if !defined( QT_WEAK_SYMBOL ) 407+#if !defined( QT_WEAK_SYMBOL )
499+#define QT_WEAK_SYMBOL 408+#define QT_WEAK_SYMBOL
500+#endif 409+#endif
@@ -515,35 +424,30 @@ diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdat
515+private: 424+private:
516+ QValueList<int> pointSizes_NonWeak( const QString &family, 425+ QValueList<int> pointSizes_NonWeak( const QString &family,
517 + const QString &style, 426 + const QString &style,
518 + const QString &charSet ); 427 + const QString &charSet );
519+public: 428+public:
520 QStringList styles( const QString &family, 429 QStringList styles( const QString &family,
521 const QString &charSet = QString::null ) const; 430 const QString &charSet = QString::null ) const;
522 QStringList charSets( const QString &familyName, 431 QStringList charSets( const QString &familyName,
523Only in qte-2.3.7/src/kernel: qfontdatabase.o 432diff -ru qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp
524Only in qte-2.3.7/src/kernel: qfontfactorybdf_qws.o 433 --- qt-2.3.7/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003
525Only in qte-2.3.7/src/kernel: qfontfactoryttf_qws.o
526Only in qte-2.3.7/src/kernel: qfontmanager_qws.o
527diff -ru qte-2.3.7_orig/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp
528 --- qte-2.3.7_orig/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003
529 +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003 434 +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003
530@@ -32,7 +32,7 @@ 435@@ -32,7 +32,7 @@
531 #include "qgfx_qws.h" 436 #include "qgfx_qws.h"
532 437
533 #include <stdio.h> 438 #include <stdio.h>
534-#include <dlfcn.h> 439-#include <dlfcn.h>
535+//#include <dlfcn.h> 440+//#include <dlfcn.h>
536 #include <sys/types.h> 441 #include <sys/types.h>
537 #include <dirent.h> 442 #include <dirent.h>
538 #include <stdlib.h> 443 #include <stdlib.h>
539Only in qte-2.3.7/src/kernel: qgfx_qws.o 444diff -ru qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp
540diff -ru qte-2.3.7_orig/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp 445 --- qt-2.3.7/src/kernel/qgfxraster_qws.cppThu Jul 17 03:20:25 2003
541 --- qte-2.3.7_orig/src/kernel/qgfxraster_qws.cppThu Jul 17 03:20:25 2003
542 +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003 446 +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003
543@@ -75,7 +75,11 @@ 447@@ -75,7 +75,11 @@
544 # if __BYTE_ORDER == __BIG_ENDIAN 448 # if __BYTE_ORDER == __BIG_ENDIAN
545 # define QWS_BIG_ENDIAN 449 # define QWS_BIG_ENDIAN
546 # endif 450 # endif
547+#elif defined(__APPLE__) 451+#elif defined(__APPLE__)
548+# define QWS_BIG_ENDIAN 452+# define QWS_BIG_ENDIAN
549 #endif 453 #endif
@@ -593,25 +497,18 @@ diff -ru qte-2.3.7_orig/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxr
593 setAlphaType(IgnoreAlpha); 497 setAlphaType(IgnoreAlpha);
594 if ( w <= 0 || h <= 0 || !ncliprect ) return; 498 if ( w <= 0 || h <= 0 || !ncliprect ) return;
595 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) 499 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
596-#ifdef QWS_EXPERIMENTAL_FASTPATH 500-#ifdef QWS_EXPERIMENTAL_FASTPATH
597+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! 501+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !!
598 // ### fix for 8bpp 502 // ### fix for 8bpp
599 // This seems to be reliable now, at least for 16bpp 503 // This seems to be reliable now, at least for 16bpp
600 504
601Only in qte-2.3.7/src/kernel: qgfxraster_qws.cpp~ 505diff -ru qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp
602Only in qte-2.3.7/src/kernel: qgfxraster_qws.o 506 --- qt-2.3.7/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003
603Only in qte-2.3.7/src/kernel: qguardedptr.o
604Only in qte-2.3.7/src/kernel: qiconset.o
605Only in qte-2.3.7/src/kernel: qimage.o
606Only in qte-2.3.7/src/kernel: qinputcontext_qws.o
607Only in qte-2.3.7/src/kernel: qjpegio.o
608diff -ru qte-2.3.7_orig/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp
609 --- qte-2.3.7_orig/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003
610 +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003 507 +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003
611@@ -69,7 +69,7 @@ 508@@ -69,7 +69,7 @@
612 #if !defined(_OS_QNX6_) 509 #if !defined(_OS_QNX6_)
613 510
614 #include <termios.h> 511 #include <termios.h>
615-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 512-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
616+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 513+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
617 #include <sys/kd.h> 514 #include <sys/kd.h>
@@ -670,87 +567,30 @@ diff -ru qte-2.3.7_orig/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeybo
670 { 567 {
671 if (kbdFD >= 0) 568 if (kbdFD >= 0)
672 { 569 {
673-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 570-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
674+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 571+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
675 ioctl(kbdFD, KDSKBMODE, K_XLATE); 572 ioctl(kbdFD, KDSKBMODE, K_XLATE);
676 #endif 573 #endif
677 tcsetattr(kbdFD, TCSANOW, &origTermData); 574 tcsetattr(kbdFD, TCSANOW, &origTermData);
678Only in qte-2.3.7/src/kernel: qkeyboard_qws.cpp.rej 575diff -ru qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp
679Only in qte-2.3.7/src/kernel: qkeyboard_qws.cpp~ 576 --- qt-2.3.7/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003
680Only in qte-2.3.7/src/kernel: qkeyboard_qws.moc
681Only in qte-2.3.7/src/kernel: qkeyboard_qws.o
682Only in qte-2.3.7/src/kernel: qlayout.o
683Only in qte-2.3.7/src/kernel: qlayoutengine.o
684Only in qte-2.3.7/src/kernel: qlocalfs.o
685diff -ru qte-2.3.7_orig/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp
686 --- qte-2.3.7_orig/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003
687 +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003 577 +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003
688@@ -38,7 +38,7 @@ 578@@ -38,7 +38,7 @@
689 #include <errno.h> 579 #include <errno.h>
690 580
691 #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \ 581 #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
692- || defined _OS_FREEBSD_ 582- || defined _OS_FREEBSD_
693+ || defined(_OS_FREEBSD_) || defined(_OS_MACX_) 583+ || defined(_OS_FREEBSD_) || defined(_OS_MACX_)
694 /* union semun is defined by including <sys/sem.h> */ 584 /* union semun is defined by including <sys/sem.h> */
695 #else 585 #else
696 /* according to X/OPEN we have to define it ourselves */ 586 /* according to X/OPEN we have to define it ourselves */
697Only in qte-2.3.7/src/kernel: qlock_qws.o 587diff -ru qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp
698Only in qte-2.3.7/src/kernel: qmemorymanager_qws.o 588 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003
699Only in qte-2.3.7/src/kernel: qmetaobject.o
700Only in qte-2.3.7/src/kernel: qmime.o
701Only in qte-2.3.7/src/kernel: qmngio.o
702Only in qte-2.3.7/src/kernel: qmovie.moc
703Only in qte-2.3.7/src/kernel: qmovie.o
704Only in qte-2.3.7/src/kernel: qnetworkprotocol.o
705Only in qte-2.3.7/src/kernel: qobject.o
706Only in qte-2.3.7/src/kernel: qpaintdevice_qws.o
707Only in qte-2.3.7/src/kernel: qpaintdevicemetrics.o
708Only in qte-2.3.7/src/kernel: qpainter.o
709Only in qte-2.3.7/src/kernel: qpainter_qws.o
710Only in qte-2.3.7/src/kernel: qpalette.o
711Only in qte-2.3.7/src/kernel: qpicture.o
712Only in qte-2.3.7/src/kernel: qpixmap.o
713Only in qte-2.3.7/src/kernel: qpixmap_qws.o
714Only in qte-2.3.7/src/kernel: qpixmapcache.o
715Only in qte-2.3.7/src/kernel: qpngio.o
716Only in qte-2.3.7/src/kernel: qpoint.o
717Only in qte-2.3.7/src/kernel: qprinter.o
718Only in qte-2.3.7/src/kernel: qprinter_qws.o
719Only in qte-2.3.7/src/kernel: qpsprinter.o
720Only in qte-2.3.7/src/kernel: qrect.o
721Only in qte-2.3.7/src/kernel: qregion.o
722Only in qte-2.3.7/src/kernel: qrichtext.o
723Only in qte-2.3.7/src/kernel: qsemimodal.o
724Only in qte-2.3.7/src/kernel: qsharedmemory.o
725Only in qte-2.3.7/src/kernel: qsignal.o
726Only in qte-2.3.7/src/kernel: qsignalmapper.o
727Only in qte-2.3.7/src/kernel: qsimplerichtext.o
728Only in qte-2.3.7/src/kernel: qsize.o
729Only in qte-2.3.7/src/kernel: qsizegrip.o
730Only in qte-2.3.7/src/kernel: qsocketnotifier.o
731Only in qte-2.3.7/src/kernel: qsound.o
732Only in qte-2.3.7/src/kernel: qsound_qws.o
733Only in qte-2.3.7/src/kernel: qsoundqss_qws.moc
734Only in qte-2.3.7/src/kernel: qsoundqss_qws.o
735Only in qte-2.3.7/src/kernel: qstyle.o
736Only in qte-2.3.7/src/kernel: qstylesheet.o
737Only in qte-2.3.7/src/kernel: qthread_unix.moc
738Only in qte-2.3.7/src/kernel: qthread_unix.o
739Only in qte-2.3.7/src/kernel: qtimer.o
740Only in qte-2.3.7/src/kernel: qtranslator.o
741Only in qte-2.3.7/src/kernel: qurl.o
742Only in qte-2.3.7/src/kernel: qurlinfo.o
743Only in qte-2.3.7/src/kernel: qurloperator.o
744Only in qte-2.3.7/src/kernel: qvariant.o
745Only in qte-2.3.7/src/kernel: qwidget.o
746Only in qte-2.3.7/src/kernel: qwidget_qws.o
747diff -ru qte-2.3.7_orig/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp
748 --- qte-2.3.7_orig/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003
749 +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003 589 +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003
750@@ -844,6 +844,18 @@ 590@@ -844,6 +844,18 @@
751 { 591 {
752 } 592 }
753 593
754+static void catchSegvSignal( int ) 594+static void catchSegvSignal( int )
755+{ 595+{
756+#ifndef QT_NO_QWS_KEYBOARD 596+#ifndef QT_NO_QWS_KEYBOARD
@@ -778,31 +618,18 @@ diff -ru qte-2.3.7_orig/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qw
778 618
779 #ifndef QT_NO_QWS_MULTIPROCESS 619 #ifndef QT_NO_QWS_MULTIPROCESS
780 if ( !geteuid() ) { 620 if ( !geteuid() ) {
781-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 621-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
782+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 622+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
783 if( mount(0, "/var/shm", "shm", 0, 0) ) { 623 if( mount(0, "/var/shm", "shm", 0, 0) ) {
784 /* This just confuses people with 2.2 kernels 624 /* This just confuses people with 2.2 kernels
785 if ( errno != EBUSY ) 625 if ( errno != EBUSY )
786Only in qte-2.3.7/src/kernel: qwindowsystem_qws.cpp~ 626diff -ru qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp
787Only in qte-2.3.7/src/kernel: qwindowsystem_qws.o 627 --- qt-2.3.7/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003
788Only in qte-2.3.7/src/kernel: qwmatrix.o
789Only in qte-2.3.7/src/kernel: qwsbeosdecoration_qws.o
790Only in qte-2.3.7/src/kernel: qwscommand_qws.o
791Only in qte-2.3.7/src/kernel: qwscursor_qws.o
792Only in qte-2.3.7/src/kernel: qwsdecoration_qws.o
793Only in qte-2.3.7/src/kernel: qwsdefaultdecoration_qws.o
794Only in qte-2.3.7/src/kernel: qwsevent_qws.o
795Only in qte-2.3.7/src/kernel: qwshydrodecoration_qws.o
796Only in qte-2.3.7/src/kernel: qwskde2decoration_qws.o
797Only in qte-2.3.7/src/kernel: qwskdedecoration_qws.o
798Only in qte-2.3.7/src/kernel: qwsmanager_qws.o
799diff -ru qte-2.3.7_orig/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp
800 --- qte-2.3.7_orig/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003
801 +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003 628 +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003
802@@ -336,7 +336,7 @@ 629@@ -336,7 +336,7 @@
803 tty.c_oflag = 0; 630 tty.c_oflag = 0;
804 tty.c_lflag = 0; 631 tty.c_lflag = 0;
805 tty.c_cflag = f | CREAD | CLOCAL | HUPCL; 632 tty.c_cflag = f | CREAD | CLOCAL | HUPCL;
806-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 633-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
807+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 634+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
808 tty.c_line = 0; 635 tty.c_line = 0;
@@ -812,60 +639,31 @@ diff -ru qte-2.3.7_orig/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmous
812 tty.c_iflag = IGNBRK | IGNPAR; 639 tty.c_iflag = IGNBRK | IGNPAR;
813 tty.c_oflag = 0; 640 tty.c_oflag = 0;
814 tty.c_lflag = 0; 641 tty.c_lflag = 0;
815-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 642-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
816+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 643+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
817 tty.c_line = 0; 644 tty.c_line = 0;
818 #endif // _OS_FREEBSD_ 645 #endif // _OS_FREEBSD_
819 tty.c_cc[VTIME] = 0; 646 tty.c_cc[VTIME] = 0;
820Only in qte-2.3.7/src/kernel: qwsmouse_qws.moc 647diff -ru qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp
821Only in qte-2.3.7/src/kernel: qwsmouse_qws.o 648 --- qt-2.3.7/src/network/qdns.cppThu Jul 17 03:20:26 2003
822Only in qte-2.3.7/src/kernel: qwsproperty_qws.o 649 +++ qte-2.3.7/src/network/qdns.cppSun Nov 16 13:44:27 2003
823Only in qte-2.3.7/src/kernel: qwsregionmanager_qws.o 650@@ -1991,7 +1991,7 @@
824Only in qte-2.3.7/src/kernel: qwssocket_qws.o 651 domains = new QStrList( TRUE );
825Only in qte-2.3.7/src/kernel: qwswindowsdecoration_qws.o 652 domains->setAutoDelete( TRUE );
826Only in qte-2.3.7/src/moc: Makefile 653
827Only in qte-2.3.7/src/moc: moc 654- res_init();
828Only in qte-2.3.7/src/moc: mocgen.o 655+ // res_init(); (eilers: Caused link problems)
829Only in qte-2.3.7/src/moc: qbuffer.o 656 int i;
830Only in qte-2.3.7/src/moc: qcollection.o 657 // find the name servers to use
831Only in qte-2.3.7/src/moc: qcstring.o 658 for( i=0; i < MAXNS && i < _res.nscount; i++ ) {
832Only in qte-2.3.7/src/moc: qdatastream.o 659diff -ru qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h
833Only in qte-2.3.7/src/moc: qdatetime.o 660 --- qt-2.3.7/src/tools/qconfig.hFri Jan 26 14:43:06 2001
834Only in qte-2.3.7/src/moc: qfile.o 661 +++ qte-2.3.7/src/tools/qconfig.hSun Nov 16 13:35:10 2003
835Only in qte-2.3.7/src/moc: qfile_unix.o
836Only in qte-2.3.7/src/moc: qgarray.o
837Only in qte-2.3.7/src/moc: qgdict.o
838Only in qte-2.3.7/src/moc: qglist.o
839Only in qte-2.3.7/src/moc: qglobal.o
840Only in qte-2.3.7/src/moc: qgvector.o
841Only in qte-2.3.7/src/moc: qiodevice.o
842Only in qte-2.3.7/src/moc: qregexp.o
843Only in qte-2.3.7/src/moc: qstring.o
844Only in qte-2.3.7/src/moc: qtextcodec.o
845Only in qte-2.3.7/src/moc: qtextstream.o
846Only in qte-2.3.7/src/moc: qutfcodec.o
847Only in qte-2.3.7/src/network: qdns.o
848Only in qte-2.3.7/src/network: qftp.o
849Only in qte-2.3.7/src/network: qhostaddress.o
850Only in qte-2.3.7/src/network: qnetwork.o
851Only in qte-2.3.7/src/network: qserversocket.o
852Only in qte-2.3.7/src/network: qsocket.o
853Only in qte-2.3.7/src/network: qsocketdevice.o
854Only in qte-2.3.7/src/network: qsocketdevice_unix.o
855Only in qte-2.3.7/src/table: qtable.o
856Only in qte-2.3.7/src/tools: qbitarray.o
857Only in qte-2.3.7/src/tools: qbuffer.o
858Only in qte-2.3.7/src/tools: qcollection.o
859Only in qte-2.3.7/src/tools: qconfig-qpe.h
860Only in qte-2.3.7/src/tools: qconfig-qpe.h~
861diff -ru qte-2.3.7_orig/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h
862 --- qte-2.3.7_orig/src/tools/qconfig.hFri Jan 26 14:43:06 2001
863 +++ qte-2.3.7/src/tools/qconfig.hWed Oct 29 22:13:16 2003
864@@ -1,3 +1,26 @@ 662@@ -1,3 +1,26 @@
865+// Copied from qconfig-qpe.h 663+// Copied from qconfig-qpe.h
866+/********************************************************************** 664+/**********************************************************************
867+** Copyright (C) 2000 Trolltech AS. All rights reserved. 665+** Copyright (C) 2000 Trolltech AS. All rights reserved.
868+** 666+**
869+** This file is part of Qtopia Environment. 667+** This file is part of Qtopia Environment.
870+** 668+**
871+** This file may be distributed and/or modified under the terms of the 669+** This file may be distributed and/or modified under the terms of the
@@ -883,17 +681,17 @@ diff -ru qte-2.3.7_orig/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h
883+** 681+**
884+**********************************************************************/ 682+**********************************************************************/
885+#ifndef QT_H 683+#ifndef QT_H
886+#endif // QT_H 684+#endif // QT_H
887+ 685+
888 // Empty leaves all features enabled. See doc/html/features.html for choices. 686 // Empty leaves all features enabled. See doc/html/features.html for choices.
889 687
890 // Note that disabling some features will produce a libqt that is not 688 // Note that disabling some features will produce a libqt that is not
891@@ -8,3 +31,69 @@ 689@@ -8,3 +31,71 @@
892 #ifndef QT_DLL 690 #ifndef QT_DLL
893 #define QT_DLL // Internal 691 #define QT_DLL // Internal
894 #endif 692 #endif
895+ 693+
896+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) 694+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
897+# define QT_NO_QWS_CURSOR 695+# define QT_NO_QWS_CURSOR
898+# define QT_NO_QWS_MOUSE_AUTO 696+# define QT_NO_QWS_MOUSE_AUTO
899+#endif 697+#endif
@@ -953,37 +751,22 @@ diff -ru qte-2.3.7_orig/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h
953+ 751+
954+//#define QT_NO_QWS_SAVEFONTS 752+//#define QT_NO_QWS_SAVEFONTS
955+//#define QT_NO_QWS_PROPERTIES 753+//#define QT_NO_QWS_PROPERTIES
956+ 754+
957+#define QT_NO_QWS_BEOS_WM_STYLE 755+#define QT_NO_QWS_BEOS_WM_STYLE
958+#define QT_NO_QWS_KDE2_WM_STYLE 756+#define QT_NO_QWS_KDE2_WM_STYLE
959+#define QT_NO_QWS_KDE_WM_STYLE 757+#define QT_NO_QWS_KDE_WM_STYLE
960+#define QT_NO_QWS_WINDOWS_WM_STYLE 758+#define QT_NO_QWS_WINDOWS_WM_STYLE
961Only in qte-2.3.7/src/tools: qconfig.h~ 759+
962Only in qte-2.3.7/src/tools: qcstring.o 760+#define QT_NO_SOUND
963Only in qte-2.3.7/src/tools: qdatastream.o 761\ No newline at end of file
964Only in qte-2.3.7/src/tools: qdatetime.o 762diff -ru qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h
965Only in qte-2.3.7/src/tools: qdir.o 763 --- qt-2.3.7/src/tools/qmodules.hFri Aug 31 17:00:56 2001
966Only in qte-2.3.7/src/tools: qdir_unix.o 764 +++ qte-2.3.7/src/tools/qmodules.hSun Nov 16 13:34:58 2003
967Only in qte-2.3.7/src/tools: qfile.o
968Only in qte-2.3.7/src/tools: qfile_unix.o
969Only in qte-2.3.7/src/tools: qfileinfo.o
970Only in qte-2.3.7/src/tools: qfileinfo_unix.o
971Only in qte-2.3.7/src/tools: qgarray.o
972Only in qte-2.3.7/src/tools: qgcache.o
973Only in qte-2.3.7/src/tools: qgdict.o
974Only in qte-2.3.7/src/tools: qglist.o
975Only in qte-2.3.7/src/tools: qglobal.o
976Only in qte-2.3.7/src/tools: qgvector.o
977Only in qte-2.3.7/src/tools: qiodevice.o
978Only in qte-2.3.7/src/tools: qmap.o
979diff -ru qte-2.3.7_orig/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h
980 --- qte-2.3.7_orig/src/tools/qmodules.hFri Aug 31 17:00:56 2001
981 +++ qte-2.3.7/src/tools/qmodules.hWed Oct 29 21:57:53 2003
982@@ -1,14 +1,12 @@ 765@@ -1,14 +1,12 @@
983-#ifndef QT_H 766-#ifndef QT_H
984-#endif // QT_H 767-#endif // QT_H
985- 768-
986+// These modules are licensed to you 769+// These modules are licensed to you
987 #define QT_MODULE_TOOLS 770 #define QT_MODULE_TOOLS
988 #define QT_MODULE_KERNEL 771 #define QT_MODULE_KERNEL
989 #define QT_MODULE_WIDGETS 772 #define QT_MODULE_WIDGETS
@@ -993,103 +776,46 @@ diff -ru qte-2.3.7_orig/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h
993 #define QT_MODULE_WORKSPACE 776 #define QT_MODULE_WORKSPACE
994-#define QT_MODULE_TABLE 777-#define QT_MODULE_TABLE
995+#define QT_MODULE_NETWORK 778+#define QT_MODULE_NETWORK
996 #define QT_MODULE_CANVAS 779 #define QT_MODULE_CANVAS
997+#define QT_MODULE_TABLE 780+#define QT_MODULE_TABLE
998 #define QT_MODULE_XML 781 #define QT_MODULE_XML
999-#define QT_MODULE_NETWORK 782-#define QT_MODULE_NETWORK
1000+#define QT_MODULE_OPENGL 783+#define QT_MODULE_OPENGL
1001Only in qte-2.3.7/src/tools: qregexp.o 784diff -ru qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp
1002Only in qte-2.3.7/src/tools: qstring.o 785 --- qt-2.3.7/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003
1003Only in qte-2.3.7/src/tools: qstringlist.o
1004Only in qte-2.3.7/src/tools: qtextcodec.o
1005Only in qte-2.3.7/src/tools: qtextstream.o
1006Only in qte-2.3.7/src/tools: qutfcodec.o
1007Only in qte-2.3.7/src/widgets: qaction.o
1008Only in qte-2.3.7/src/widgets: qbutton.o
1009Only in qte-2.3.7/src/widgets: qbuttongroup.o
1010Only in qte-2.3.7/src/widgets: qcdestyle.o
1011Only in qte-2.3.7/src/widgets: qcheckbox.o
1012Only in qte-2.3.7/src/widgets: qcombobox.o
1013diff -ru qte-2.3.7_orig/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp
1014 --- qte-2.3.7_orig/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003
1015 +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003 786 +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003
1016@@ -566,7 +566,7 @@ 787@@ -566,7 +566,7 @@
1017 bool enabled, bool active ) 788 bool enabled, bool active )
1018 { 789 {
1019 #ifndef QT_NO_MENUBAR 790 #ifndef QT_NO_MENUBAR
1020-#ifndef QT_NO_STYLE_SGI 791-#ifndef QT_NO_STYLE_SGI
1021+#if 1 // #ifndef QT_NO_STYLE_SGI 792+#if 1 // #ifndef QT_NO_STYLE_SGI
1022 if (draw_menu_bar_impl != 0) { 793 if (draw_menu_bar_impl != 0) {
1023 QDrawMenuBarItemImpl impl = draw_menu_bar_impl; 794 QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
1024 (this->*impl)(p, x, y, w, h, mi, g, enabled, active); 795 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
1025Only in qte-2.3.7/src/widgets: qcommonstyle.o 796diff -ru qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp
1026Only in qte-2.3.7/src/widgets: qcompactstyle.o 797 --- qt-2.3.7/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003
1027Only in qte-2.3.7/src/widgets: qdial.o
1028Only in qte-2.3.7/src/widgets: qeffects.moc
1029Only in qte-2.3.7/src/widgets: qeffects.o
1030Only in qte-2.3.7/src/widgets: qframe.o
1031Only in qte-2.3.7/src/widgets: qgrid.o
1032Only in qte-2.3.7/src/widgets: qgroupbox.o
1033Only in qte-2.3.7/src/widgets: qhbox.o
1034Only in qte-2.3.7/src/widgets: qhbuttongroup.o
1035Only in qte-2.3.7/src/widgets: qheader.o
1036Only in qte-2.3.7/src/widgets: qhgroupbox.o
1037Only in qte-2.3.7/src/widgets: qinterlacestyle.o
1038Only in qte-2.3.7/src/widgets: qlabel.o
1039Only in qte-2.3.7/src/widgets: qlcdnumber.o
1040Only in qte-2.3.7/src/widgets: qlineedit.o
1041Only in qte-2.3.7/src/widgets: qlistbox.o
1042diff -ru qte-2.3.7_orig/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp
1043 --- qte-2.3.7_orig/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003
1044 +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003 798 +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003
1045@@ -4968,9 +4968,9 @@ 799@@ -4968,9 +4968,9 @@
1046 l = l->childItem ? l->childItem : l->siblingItem; 800 l = l->childItem ? l->childItem : l->siblingItem;
1047 801
1048 if ( l && l->height() ) 802 if ( l && l->height() )
1049 -s.setHeight( s.height() + 10 * l->height() ); 803 -s.setHeight( s.height() + 10 * l->height() );
1050- else 804- else
1051 -s.setHeight( s.height() + 140 ); 805 -s.setHeight( s.height() + 140 );
1052 +s.setHeight( s.height() + 4 /*10*/ * l->height() ); 806 +s.setHeight( s.height() + 4 /*10*/ * l->height() );
1053+ else // ^v much too big for handhelds 807+ else // ^v much too big for handhelds
1054 +s.setHeight( s.height() + 30 /*140*/ ); 808 +s.setHeight( s.height() + 30 /*140*/ );
1055 809
1056 if ( s.width() > s.height() * 3 ) 810 if ( s.width() > s.height() * 3 )
1057 s.setHeight( s.width() / 3 ); 811 s.setHeight( s.width() / 3 );
1058Only in qte-2.3.7/src/widgets: qlistview.o 812diff -ru qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp
1059Only in qte-2.3.7/src/widgets: qmainwindow.moc 813 --- qt-2.3.7/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003
1060Only in qte-2.3.7/src/widgets: qmainwindow.o
1061Only in qte-2.3.7/src/widgets: qmenubar.o
1062Only in qte-2.3.7/src/widgets: qmenudata.o
1063Only in qte-2.3.7/src/widgets: qmotifplusstyle.o
1064Only in qte-2.3.7/src/widgets: qmotifstyle.o
1065Only in qte-2.3.7/src/widgets: qmultilineedit.o
1066Only in qte-2.3.7/src/widgets: qplatinumstyle.o
1067Only in qte-2.3.7/src/widgets: qpopupmenu.o
1068Only in qte-2.3.7/src/widgets: qprogressbar.o
1069Only in qte-2.3.7/src/widgets: qpushbutton.o
1070Only in qte-2.3.7/src/widgets: qradiobutton.o
1071Only in qte-2.3.7/src/widgets: qrangecontrol.o
1072Only in qte-2.3.7/src/widgets: qscrollbar.o
1073Only in qte-2.3.7/src/widgets: qscrollview.o
1074Only in qte-2.3.7/src/widgets: qsgistyle.o
1075Only in qte-2.3.7/src/widgets: qslider.o
1076Only in qte-2.3.7/src/widgets: qspinbox.o
1077Only in qte-2.3.7/src/widgets: qsplitter.o
1078Only in qte-2.3.7/src/widgets: qstatusbar.o
1079Only in qte-2.3.7/src/widgets: qtabbar.o
1080Only in qte-2.3.7/src/widgets: qtableview.o
1081Only in qte-2.3.7/src/widgets: qtabwidget.o
1082Only in qte-2.3.7/src/widgets: qtextbrowser.o
1083Only in qte-2.3.7/src/widgets: qtextview.o
1084Only in qte-2.3.7/src/widgets: qtoolbar.moc
1085Only in qte-2.3.7/src/widgets: qtoolbar.o
1086diff -ru qte-2.3.7_orig/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp
1087 --- qte-2.3.7_orig/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003
1088 +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003 814 +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003
1089@@ -230,7 +230,7 @@ 815@@ -230,7 +230,7 @@
1090 else 816 else
1091 QToolTip::add( this, textLabel ); 817 QToolTip::add( this, textLabel );
1092 } 818 }
1093 -#endif 819 -#endif
1094+#endif 820+#endif
1095 } 821 }
@@ -1108,54 +834,8 @@ diff -ru qte-2.3.7_orig/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolb
1108 +if ( h < 24 ) 834 +if ( h < 24 )
1109 + h = 24; 835 + h = 24;
1110 } else { 836 } else {
1111 -w = h = 16; 837 -w = h = 16;
1112 +w = h = 14; 838 +w = h = 14;
1113 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); 839 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
1114 w = pm.width(); 840 w = pm.width();
1115 h = pm.height(); 841 h = pm.height();
1116Only in qte-2.3.7/src/widgets: qtoolbutton.o
1117Only in qte-2.3.7/src/widgets: qtooltip.moc
1118Only in qte-2.3.7/src/widgets: qtooltip.o
1119Only in qte-2.3.7/src/widgets: qvalidator.o
1120Only in qte-2.3.7/src/widgets: qvbox.o
1121Only in qte-2.3.7/src/widgets: qvbuttongroup.o
1122Only in qte-2.3.7/src/widgets: qvgroupbox.o
1123Only in qte-2.3.7/src/widgets: qwhatsthis.moc
1124Only in qte-2.3.7/src/widgets: qwhatsthis.o
1125Only in qte-2.3.7/src/widgets: qwidgetstack.o
1126Only in qte-2.3.7/src/widgets: qwindowsstyle.o
1127Only in qte-2.3.7/src/workspace: qworkspace.moc
1128Only in qte-2.3.7/src/workspace: qworkspace.o
1129Only in qte-2.3.7/src/xml: qdom.o
1130Only in qte-2.3.7/src/xml: qxml.o
1131Only in qte-2.3.7: src-mt.mk
1132Only in qte-2.3.7: stamp-headers
1133Only in qte-2.3.7/tools: Makefile
1134Only in qte-2.3.7/tools/designer: Makefile
1135Only in qte-2.3.7/tools/designer/designer: Makefile
1136Only in qte-2.3.7/tools/designer/examples/walkthrough: Makefile
1137Only in qte-2.3.7/tools/designer/integration/rc2ui: Makefile
1138Only in qte-2.3.7/tools/designer/tools/createcw: Makefile
1139Only in qte-2.3.7/tools/designer/uic: Makefile
1140Only in qte-2.3.7/tools/designer/util: Makefile
1141Only in qte-2.3.7/tools/makeqpf: Makefile
1142Only in qte-2.3.7/tools/mergetr: Makefile
1143Only in qte-2.3.7/tools/msg2qm: Makefile
1144Only in qte-2.3.7/tools/qconfig: Makefile
1145Only in qte-2.3.7/tools/qembed: Makefile
1146Only in qte-2.3.7/tools/qvfb: Makefile
1147Only in qte-2.3.7/tutorial: Makefile
1148Only in qte-2.3.7/tutorial/t1: Makefile
1149Only in qte-2.3.7/tutorial/t10: Makefile
1150Only in qte-2.3.7/tutorial/t11: Makefile
1151Only in qte-2.3.7/tutorial/t12: Makefile
1152Only in qte-2.3.7/tutorial/t13: Makefile
1153Only in qte-2.3.7/tutorial/t14: Makefile
1154Only in qte-2.3.7/tutorial/t2: Makefile
1155Only in qte-2.3.7/tutorial/t3: Makefile
1156Only in qte-2.3.7/tutorial/t4: Makefile
1157Only in qte-2.3.7/tutorial/t5: Makefile
1158Only in qte-2.3.7/tutorial/t6: Makefile
1159Only in qte-2.3.7/tutorial/t7: Makefile
1160Only in qte-2.3.7/tutorial/t8: Makefile
1161Only in qte-2.3.7/tutorial/t9: Makefile