summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--qt/qt-2.3.7.patch/qte237-all-macosx.patch471
1 files changed, 446 insertions, 25 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 d1b3fdc..8e42396 100644
--- a/qt/qt-2.3.7.patch/qte237-all-macosx.patch
+++ b/qt/qt-2.3.7.patch/qte237-all-macosx.patch
@@ -1,17 +1,121 @@
1diff -ru qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h 1Binary files qt-2.3.7/bin/moc and qte-2.3.7/bin/moc differ
2Binary files qt-2.3.7/bin/uic and qte-2.3.7/bin/uic differ
3diff -uNr --exclude-from=./diff_ignore qt-2.3.7/configs/darwin-generic-g++-shared qte-2.3.7/configs/darwin-generic-g++-shared
4 --- qt-2.3.7/configs/darwin-generic-g++-sharedThu Jan 1 01:00:00 1970
5 +++ qte-2.3.7/configs/darwin-generic-g++-sharedMon Oct 27 14:27:25 2003
6@@ -0,0 +1,98 @@
7+# Compiling
8 +INTERFACE_DECL_PATH = .
9 +SYSCONF_CXX = g++
10 +SYSCONF_CC = gcc
11 +DASHCROSS =
12+
13+# Compiling with support libraries
14 +SYSCONF_CXXFLAGS_X11= -I/usr/X11R6/include
15 +SYSCONF_CXXFLAGS_QT= -I$(QTDIR)/include
16 +SYSCONF_CXXFLAGS_QTOPIA= -I$(QPEDIR)/include
17 +SYSCONF_CXXFLAGS_OPENGL= -I/usr/X11R6/include
18+
19+# Compiling YACC output
20+SYSCONF_CXXFLAGS_YACC = -Wno-unused -Wno-parentheses
21+
22+# Linking with support libraries
23 +SYSCONF_RPATH_X11= -L/usr/X11R6/lib
24 +SYSCONF_RPATH_QT= -L$(QTDIR)/lib
25 +SYSCONF_RPATH_QTOPIA= -L$(QPEDIR)/lib
26 +SYSCONF_RPATH_OPENGL= -L/usr/X11R6/lib
27+
28+# Linking with support libraries
29+# X11
30 +SYSCONF_LFLAGS_X11= -L/usr/X11R6/lib
31 +SYSCONF_LIBS_X11=
32+# Qt, Qt+OpenGL
33 +SYSCONF_LFLAGS_QT= -L$(QTDIR)/lib
34 +SYSCONF_LFLAGS_QTOPIA= -L$(QPEDIR)/lib
35 +SYSCONF_LIBS_QT = -lqte$(QT_THREAD_SUFFIX)
36 +SYSCONF_LIBS_QT_OPENGL=
37 +SYSCONF_LIBS_QTOPIA= -lqtopia
38+# OpenGL
39 +SYSCONF_LFLAGS_OPENGL= -L/usr/X11R6/lib
40 +SYSCONF_LIBS_OPENGL= -lGLU -lGL -lXmu
41+# Yacc
42 +SYSCONF_LIBS_YACC=
43+
44+# Linking applications
45 +SYSCONF_LINK = g++
46 +SYSCONF_LFLAGS =
47 +SYSCONF_LIBS =
48+
49+# Link flags for shared objects
50 +SYSCONF_LFLAGS_SHOBJ= -dynamiclib
51+
52+# Flags for threading
53 +SYSCONF_CFLAGS_THREAD= -pthread -D_THREAD_SAFE
54 +SYSCONF_CXXFLAGS_THREAD= -pthread -D_THREAD_SAFE
55 +SYSCONF_LFLAGS_THREAD= -pthread
56 +SYSCONF_LIBS_THREAD=
57+
58+# Meta-object compiler
59 +SYSCONF_MOC = $(QTDIR)/bin/moc
60+
61+# UI compiler
62 +SYSCONF_UIC = $(QTDIR)/bin/uic
63+
64+# Linking shared libraries
65+# - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
66+# - Place target in $(DESTDIR) - which has a trailing /
67+# - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
68+#
69 +SYSCONF_LINK_SHLIB= g++
70 +SYSCONF_LINK_TARGET_SHARED= lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
71 +SYSCONF_LINK_LIB_SHARED= $(SYSCONF_LINK_SHLIB) -dynamiclib \
72 + $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
73 + $(OBJECTS) $(OBJMOC) $(LIBS) && \
74 + mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
75 + cd $(DESTDIR) && \
76 + rm -f lib$(TARGET).dylib lib$(TARGET).dylib.$(VER_MAJ) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN); \
77 + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib; \
78 + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ); \
79 + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).dylib.$(VER_MAJ).$(VER_MIN)
80+
81+# Linking static libraries
82+# - Build the $(TARGET) library, eg. lib$(TARGET).a
83+# - Place target in $(DESTDIR) - which has a trailing /
84+#
85 +SYSCONF_AR = ar cqs
86+SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
87 +SYSCONF_LINK_LIB_STATIC= rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
88 + $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC)
89+# Compiling application source
90 +SYSCONF_CXXFLAGS= -pipe -fno-exceptions -DQWS -fno-rtti -fno-exceptions -DQT_NO_QWS_LINUXFB -DQT_NO_QWS_TRANSFORMED -O0 -Wall -W -DNO_DEBUG
91 +SYSCONF_CFLAGS = -pipe -fno-exceptions -O2 -Wall -W
92+# Default link type (static linking is still be used where required)
93 +SYSCONF_LINK_LIB= $(SYSCONF_LINK_LIB_SHARED)
94 +SYSCONF_LINK_TARGET= $(SYSCONF_LINK_TARGET_SHARED)
95+# Compiling library source
96 +SYSCONF_CXXFLAGS_LIB= -fPIC
97 +SYSCONF_CFLAGS_LIB= -fPIC
98+# Compiling shared-object source
99 +SYSCONF_CXXFLAGS_SHOBJ= -fPIC
100 +SYSCONF_CFLAGS_SHOBJ= -fPIC
101+# Linking Qt
102 +SYSCONF_LIBS_QTLIB= $(SYSCONF_LFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
103+# Linking Qt applications
104 +SYSCONF_LIBS_QTAPP=
105diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h
2 --- qt-2.3.7/include/qapplication.hThu Jul 17 03:20:25 2003 106 --- 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 107 +++ qte-2.3.7/include/qapplication.hMon Oct 27 14:21:28 2003
4@@ -61,6 +61,10 @@ 108@@ -61,6 +61,10 @@
5 class QSemaphore; 109 class QSemaphore;
6 #endif 110 #endif
7 111
8+#if !defined( QT_WEAK_SYMBOL ) 112+#if !defined( QT_WEAK_SYMBOL )
9+#define QT_WEAK_SYMBOL 113+#define QT_WEAK_SYMBOL
10+#endif 114+#endif
11+ 115+
12 // REMOVE IN 3.0 (just here for moc source compatibility) 116 // REMOVE IN 3.0 (just here for moc source compatibility)
13 #define QNonBaseApplication QApplication 117 #define QNonBaseApplication QApplication
14 118
15@@ -85,7 +89,10 @@ 119@@ -85,7 +89,10 @@
16 120
17 #ifndef QT_NO_STYLE 121 #ifndef QT_NO_STYLE
@@ -43,35 +147,139 @@ diff -ru qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h
43 +public: 147 +public:
44 static QFontMetrics fontMetrics(); 148 static QFontMetrics fontMetrics();
45 149
46 QWidget *mainWidget() const; 150 QWidget *mainWidget() const;
47@@ -207,7 +222,10 @@ 151@@ -207,7 +222,10 @@
48 void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); 152 void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
49 #ifndef QT_NO_QWS_MANAGER 153 #ifndef QT_NO_QWS_MANAGER
50 static QWSDecoration &qwsDecoration(); 154 static QWSDecoration &qwsDecoration();
51- static void qwsSetDecoration( QWSDecoration *); 155- static void qwsSetDecoration( QWSDecoration *);
52+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 156+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
53+private: 157+private:
54+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 158+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
55+public: 159+public:
56 #endif 160 #endif
57 #endif 161 #endif
58 162
59diff -ru qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h 163diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qconfig-qpe.h qte-2.3.7/include/qconfig-qpe.h
164 --- qt-2.3.7/include/qconfig-qpe.hThu Jan 1 01:00:00 1970
165 +++ qte-2.3.7/include/qconfig-qpe.hSun Dec 14 12:48:43 2003
166@@ -0,0 +1,100 @@
167+/**********************************************************************
168+** Copyright (C) 2000 Trolltech AS. All rights reserved.
169+**
170+** This file is part of Qtopia Environment.
171+**
172+** This file may be distributed and/or modified under the terms of the
173+** GNU General Public License version 2 as published by the Free Software
174+** Foundation and appearing in the file LICENSE.GPL included in the
175+** packaging of this file.
176+**
177+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
178+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
179+**
180+** See http://www.trolltech.com/gpl/ for GPL licensing information.
181+**
182+** Contact info@trolltech.com if any conditions of this licensing are
183+** not clear to you.
184+**
185+**********************************************************************/
186+#ifndef QT_H
187+#endif // QT_H
188+
189+// Empty leaves all features enabled. See doc/html/features.html for choices.
190+
191+// Note that disabling some features will produce a libqt that is not
192+// compatible with other libqt builds. Such modifications are only
193+// supported on Qt/Embedded where reducing the library size is important
194+// and where the application-suite is often a fixed set.
195+
196+#ifndef QT_DLL
197+#define QT_DLL // Internal
198+#endif
199+
200+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
201+# define QT_NO_QWS_CURSOR
202+# define QT_NO_QWS_MOUSE_AUTO
203+#endif
204+#ifndef QT_NO_CODECS
205+#define QT_NO_CODECS
206+#endif
207+#define QT_NO_UNICODETABLES
208+//#define QT_NO_IMAGEIO_BMP
209+#define QT_NO_IMAGEIO_PPM
210+//#define QT_NO_ASYNC_IO
211+//#define QT_NO_ASYNC_IMAGE_IO
212+#define QT_NO_FREETYPE
213+#define QT_NO_BDF
214+//#define QT_NO_FONTDATABASE
215+#define QT_NO_DRAGANDDROP
216+//#define QT_NO_CLIPBOARD
217+#define QT_NO_PROPERTIES
218+#define QT_NO_NETWORKPROTOCOL
219+
220+#define QT_NO_IMAGE_TEXT
221+
222+//#define QT_NO_TOOLTIP
223+#define QT_NO_COLORNAMES
224+#define QT_NO_TRANSFORMATIONS
225+#define QT_NO_TRANSLATION_BUILDER
226+#define QT_NO_COMPLEXTEXT
227+#define QT_NO_PRINTER
228+#define QT_NO_PICTURE
229+//#define QT_NO_ICONVIEW
230+#define QT_NO_DIAL
231+#define QT_NO_SIZEGRIP
232+#define QT_NO_WORKSPACE
233+//#define QT_NO_TABLE
234+//#define QT_NO_ACTION
235+//#define QT_NO_SETTINGS
236+#define QT_NO_STYLE_POCKETPC
237+#ifndef QT_NO_STYLE_AQUA
238+# define QT_NO_STYLE_AQUA
239+#endif
240+#define QT_NO_STYLE_MOTIF
241+#define QT_NO_STYLE_PLATINUM
242+#define QT_NO_FILEDIALOG
243+#define QT_NO_FONTDIALOG
244+#define QT_NO_PRINTDIALOG
245+#define QT_NO_COLORDIALOG
246+#define QT_NO_INPUTDIALOG
247+//#define QT_NO_MESSAGEBOX
248+#define QT_NO_PROGRESSDIALOG
249+//#define QT_NO_TABDIALOG
250+#define QT_NO_WIZARD
251+#define QT_NO_EFFECTS
252+//#define QT_NO_COMPONENT
253+#define QT_NO_DOM
254+#define QT_NO_SEMIMODAL
255+//#define QT_NO_PROGRESSBAR
256+#define QT_NO_SPLITTER
257+
258+//#define QT_NO_QWS_SAVEFONTS
259+//#define QT_NO_QWS_PROPERTIES
260+
261+#define QT_NO_QWS_BEOS_WM_STYLE
262+#define QT_NO_QWS_KDE2_WM_STYLE
263+#define QT_NO_QWS_KDE_WM_STYLE
264+#define QT_NO_QWS_WINDOWS_WM_STYLE
265+
266+#define QT_NO_SOUND
267diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h
60 --- qt-2.3.7/include/qconfig.hFri Jan 26 14:43:06 2001 268 --- qt-2.3.7/include/qconfig.hFri Jan 26 14:43:06 2001
61 +++ qte-2.3.7/include/qconfig.hSun Nov 16 13:35:10 2003 269 +++ qte-2.3.7/include/qconfig.hThu Dec 11 12:54:20 2003
62@@ -1,3 +1,26 @@ 270@@ -1,3 +1,26 @@
63+// Copied from qconfig-qpe.h 271+// Copied from qconfig-qpe.h
64+/********************************************************************** 272+/**********************************************************************
65+** Copyright (C) 2000 Trolltech AS. All rights reserved. 273+** Copyright (C) 2000 Trolltech AS. All rights reserved.
66+** 274+**
67+** This file is part of Qtopia Environment. 275+** This file is part of Qtopia Environment.
68+** 276+**
69+** This file may be distributed and/or modified under the terms of the 277+** This file may be distributed and/or modified under the terms of the
70+** GNU General Public License version 2 as published by the Free Software 278+** GNU General Public License version 2 as published by the Free Software
71+** Foundation and appearing in the file LICENSE.GPL included in the 279+** Foundation and appearing in the file LICENSE.GPL included in the
72+** packaging of this file. 280+** packaging of this file.
73+** 281+**
74+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 282+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
75+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 283+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
76+** 284+**
77+** See http://www.trolltech.com/gpl/ for GPL licensing information. 285+** See http://www.trolltech.com/gpl/ for GPL licensing information.
@@ -146,87 +354,151 @@ diff -ru qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h
146+//#define QT_NO_COMPONENT 354+//#define QT_NO_COMPONENT
147+#define QT_NO_DOM 355+#define QT_NO_DOM
148+#define QT_NO_SEMIMODAL 356+#define QT_NO_SEMIMODAL
149+//#define QT_NO_PROGRESSBAR 357+//#define QT_NO_PROGRESSBAR
150+#define QT_NO_SPLITTER 358+#define QT_NO_SPLITTER
151+ 359+
152+//#define QT_NO_QWS_SAVEFONTS 360+//#define QT_NO_QWS_SAVEFONTS
153+//#define QT_NO_QWS_PROPERTIES 361+//#define QT_NO_QWS_PROPERTIES
154+ 362+
155+#define QT_NO_QWS_BEOS_WM_STYLE 363+#define QT_NO_QWS_BEOS_WM_STYLE
156+#define QT_NO_QWS_KDE2_WM_STYLE 364+#define QT_NO_QWS_KDE2_WM_STYLE
157+#define QT_NO_QWS_KDE_WM_STYLE 365+#define QT_NO_QWS_KDE_WM_STYLE
158+#define QT_NO_QWS_WINDOWS_WM_STYLE 366+#define QT_NO_QWS_WINDOWS_WM_STYLE
159+ 367+
160+#define QT_NO_SOUND 368+#define QT_NO_SOUND
161\ No newline at end of file 369\ No newline at end of file
162diff -ru qt-2.3.7/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h 370diff -uNr --exclude-from=./diff_ignore 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 371 --- qt-2.3.7/include/qfontdatabase.hThu Jul 17 03:20:25 2003
164 +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003 372 +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003
165@@ -59,6 +59,10 @@ 373@@ -59,6 +59,10 @@
166 class QDiskFont; 374 class QDiskFont;
167 #endif 375 #endif
168 376
169+#if !defined( QT_WEAK_SYMBOL ) 377+#if !defined( QT_WEAK_SYMBOL )
170+#define QT_WEAK_SYMBOL 378+#define QT_WEAK_SYMBOL
171+#endif 379+#endif
172+ 380+
173 class QFontDatabasePrivate; 381 class QFontDatabasePrivate;
174 382
175 class Q_EXPORT QFontDatabase 383 class Q_EXPORT QFontDatabase
176@@ -67,9 +71,16 @@ 384@@ -67,9 +71,16 @@
177 QFontDatabase(); 385 QFontDatabase();
178 386
179 QStringList families( bool onlyForLocale = TRUE ) const; 387 QStringList families( bool onlyForLocale = TRUE ) const;
180+ 388+
181+ 389+
182 QValueList<int> pointSizes( const QString &family, 390 QValueList<int> pointSizes( const QString &family,
183 const QString &style = QString::null, 391 const QString &style = QString::null,
184 - const QString &charSet = QString::null ); 392 - const QString &charSet = QString::null );
185 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; 393 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
186+private: 394+private:
187+ QValueList<int> pointSizes_NonWeak( const QString &family, 395+ QValueList<int> pointSizes_NonWeak( const QString &family,
188 + const QString &style, 396 + const QString &style,
189 + const QString &charSet ); 397 + const QString &charSet );
190+public: 398+public:
191 QStringList styles( const QString &family, 399 QStringList styles( const QString &family,
192 const QString &charSet = QString::null ) const; 400 const QString &charSet = QString::null ) const;
193 QStringList charSets( const QString &familyName, 401 QStringList charSets( const QString &familyName,
194diff -ru qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h 402diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qgifimageformat_p.h qte-2.3.7/include/qgifimageformat_p.h
403 --- qt-2.3.7/include/qgifimageformat_p.hThu Jul 17 03:20:24 2003
404 +++ qte-2.3.7/include/qgifimageformat_p.hThu Jan 1 01:00:00 1970
405@@ -1,56 +0,0 @@
406-/****************************************************************************
407-** $Id$
408-**
409-** Implementation of gif image/movie loading classes
410-**
411-** Created : 970617
412-**
413-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
414-**
415-** This file is part of the kernel module of the Qt GUI Toolkit.
416-**
417-** This file may be distributed under the terms of the Q Public License
418-** as defined by Trolltech AS of Norway and appearing in the file
419-** LICENSE.QPL included in the packaging of this file.
420-**
421-** This file may be distributed and/or modified under the terms of the
422-** GNU General Public License version 2 as published by the Free Software
423-** Foundation and appearing in the file LICENSE.GPL included in the
424-** packaging of this file.
425-**
426-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
427-** licenses may use this file in accordance with the Qt Commercial License
428-** Agreement provided with the Software.
429-**
430-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
431-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
432-**
433-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
434-** information about Qt Commercial License Agreements.
435-** See http://www.trolltech.com/qpl/ for QPL licensing information.
436-** See http://www.trolltech.com/gpl/ for GPL licensing information.
437-**
438-** Contact info@trolltech.com if any conditions of this licensing are
439-** not clear to you.
440-**
441-**********************************************************************/
442-
443-#ifndef QT_H
444-#include "qasyncimageio.h"
445-#include "qgif.h"
446-#endif // QT_H
447-
448-#ifndef QT_NO_ASYNC_IMAGE_IO
449-
450-// See qgif.h for important information regarding this option
451-#if defined(QT_BUILTIN_GIF_READER) && QT_BUILTIN_GIF_READER == 1
452-
453-class Q_EXPORT QGIFFormatType : public QImageFormatType
454-{
455- QImageFormat* decoderFor(const uchar* buffer, int length);
456- const char* formatName() const;
457-};
458-
459-#endif // QT_BUILTIN_GIF_READER
460-
461-#endif // QT_NO_ASYNC_IMAGE_IO
462diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h
195 --- qt-2.3.7/include/qmodules.hFri Aug 31 17:00:56 2001 463 --- qt-2.3.7/include/qmodules.hFri Aug 31 17:00:56 2001
196 +++ qte-2.3.7/include/qmodules.hSun Nov 16 13:34:58 2003 464 +++ qte-2.3.7/include/qmodules.hThu Dec 11 12:53:57 2003
197@@ -1,14 +1,12 @@ 465@@ -1,14 +1,12 @@
198-#ifndef QT_H 466-#ifndef QT_H
199-#endif // QT_H 467-#endif // QT_H
200- 468-
201+// These modules are licensed to you 469+// These modules are licensed to you
202 #define QT_MODULE_TOOLS 470 #define QT_MODULE_TOOLS
203 #define QT_MODULE_KERNEL 471 #define QT_MODULE_KERNEL
204 #define QT_MODULE_WIDGETS 472 #define QT_MODULE_WIDGETS
205 #define QT_MODULE_DIALOGS 473 #define QT_MODULE_DIALOGS
206- 474-
207 #define QT_MODULE_ICONVIEW 475 #define QT_MODULE_ICONVIEW
208 #define QT_MODULE_WORKSPACE 476 #define QT_MODULE_WORKSPACE
209-#define QT_MODULE_TABLE 477-#define QT_MODULE_TABLE
210+#define QT_MODULE_NETWORK 478+#define QT_MODULE_NETWORK
211 #define QT_MODULE_CANVAS 479 #define QT_MODULE_CANVAS
212+#define QT_MODULE_TABLE 480+#define QT_MODULE_TABLE
213 #define QT_MODULE_XML 481 #define QT_MODULE_XML
214-#define QT_MODULE_NETWORK 482-#define QT_MODULE_NETWORK
215+#define QT_MODULE_OPENGL 483+#define QT_MODULE_OPENGL
216diff -ru qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp 484Binary files qt-2.3.7/lib/libqte.dylib and qte-2.3.7/lib/libqte.dylib differ
485Binary files qt-2.3.7/lib/libqte.dylib.2 and qte-2.3.7/lib/libqte.dylib.2 differ
486Binary files qt-2.3.7/lib/libqte.dylib.2.3 and qte-2.3.7/lib/libqte.dylib.2.3 differ
487Binary files qt-2.3.7/lib/libqte.dylib.2.3.7 and qte-2.3.7/lib/libqte.dylib.2.3.7 differ
488diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp
217 --- qt-2.3.7/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003 489 --- qt-2.3.7/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003
218 +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003 490 +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003
219@@ -35,6 +35,8 @@ 491@@ -35,6 +35,8 @@
220 ** 492 **
221 **********************************************************************/ 493 **********************************************************************/
222 494
223 +#define QT_WEAK_SYMBOL__attribute__(( weak )) 495 +#define QT_WEAK_SYMBOL__attribute__(( weak ))
224+ 496+
225 #include "qobjectlist.h" 497 #include "qobjectlist.h"
226 #include "qobjectdict.h" 498 #include "qobjectdict.h"
227 #include "qapplication.h" 499 #include "qapplication.h"
228@@ -933,11 +935,16 @@ 500@@ -933,11 +935,16 @@
229 #ifndef QT_NO_STYLE 501 #ifndef QT_NO_STYLE
230 void QApplication::setStyle( QStyle *style ) 502 void QApplication::setStyle( QStyle *style )
231 { 503 {
232 +setStyle_NonWeak ( style ); 504 +setStyle_NonWeak ( style );
@@ -285,33 +557,33 @@ diff -ru qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.
285 #endif 557 #endif
286 bool all = FALSE; 558 bool all = FALSE;
287 if ( !className ) { 559 if ( !className ) {
288@@ -1273,6 +1299,12 @@ 560@@ -1273,6 +1299,12 @@
289 */ 561 */
290 562
291 void QApplication::setFont( const QFont &font, bool informWidgets, 563 void QApplication::setFont( const QFont &font, bool informWidgets,
292 + const char* className ) 564 + const char* className )
293+{ 565+{
294 +setFont_NonWeak ( font, informWidgets, className ); 566 +setFont_NonWeak ( font, informWidgets, className );
295+} 567+}
296+ 568+
297+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, 569+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets,
298 const char* className ) 570 const char* className )
299 { 571 {
300 bool all = FALSE; 572 bool all = FALSE;
301diff -ru qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h 573diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h
302 --- qt-2.3.7/src/kernel/qapplication.hThu Jul 17 03:20:25 2003 574 --- qt-2.3.7/src/kernel/qapplication.hThu Jul 17 03:20:25 2003
303 +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003 575 +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003
304@@ -61,6 +61,10 @@ 576@@ -61,6 +61,10 @@
305 class QSemaphore; 577 class QSemaphore;
306 #endif 578 #endif
307 579
308+#if !defined( QT_WEAK_SYMBOL ) 580+#if !defined( QT_WEAK_SYMBOL )
309+#define QT_WEAK_SYMBOL 581+#define QT_WEAK_SYMBOL
310+#endif 582+#endif
311+ 583+
312 // REMOVE IN 3.0 (just here for moc source compatibility) 584 // REMOVE IN 3.0 (just here for moc source compatibility)
313 #define QNonBaseApplication QApplication 585 #define QNonBaseApplication QApplication
314 586
315@@ -85,7 +89,10 @@ 587@@ -85,7 +89,10 @@
316 588
317 #ifndef QT_NO_STYLE 589 #ifndef QT_NO_STYLE
@@ -343,118 +615,118 @@ diff -ru qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h
343 +public: 615 +public:
344 static QFontMetrics fontMetrics(); 616 static QFontMetrics fontMetrics();
345 617
346 QWidget *mainWidget() const; 618 QWidget *mainWidget() const;
347@@ -207,7 +222,10 @@ 619@@ -207,7 +222,10 @@
348 void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); 620 void qwsSetCustomColors( QRgb *colortable, int start, int numColors );
349 #ifndef QT_NO_QWS_MANAGER 621 #ifndef QT_NO_QWS_MANAGER
350 static QWSDecoration &qwsDecoration(); 622 static QWSDecoration &qwsDecoration();
351- static void qwsSetDecoration( QWSDecoration *); 623- static void qwsSetDecoration( QWSDecoration *);
352+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; 624+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL;
353+private: 625+private:
354+ static void qwsSetDecoration_NonWeak( QWSDecoration *); 626+ static void qwsSetDecoration_NonWeak( QWSDecoration *);
355+public: 627+public:
356 #endif 628 #endif
357 #endif 629 #endif
358 630
359diff -ru qt-2.3.7/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp 631diff -uNr --exclude-from=./diff_ignore qt-2.3.7/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 632 --- qt-2.3.7/src/kernel/qapplication_qws.cppThu Jul 17 03:20:25 2003
361 +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003 633 +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003
362@@ -2804,6 +2804,11 @@ 634@@ -2804,6 +2804,11 @@
363 */ 635 */
364 void QApplication::qwsSetDecoration( QWSDecoration *d ) 636 void QApplication::qwsSetDecoration( QWSDecoration *d )
365 { 637 {
366 +qwsSetDecoration_NonWeak ( d ); 638 +qwsSetDecoration_NonWeak ( d );
367+} 639+}
368+ 640+
369+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) 641+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d )
370+{ 642+{
371 if ( d ) { 643 if ( d ) {
372 delete qws_decoration; 644 delete qws_decoration;
373 qws_decoration = d; 645 qws_decoration = d;
374diff -ru qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp 646diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp
375 --- qt-2.3.7/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003 647 --- qt-2.3.7/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003
376 +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003 648 +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003
377@@ -35,6 +35,8 @@ 649@@ -35,6 +35,8 @@
378 ** 650 **
379 **********************************************************************/ 651 **********************************************************************/
380 652
381+#define QT_WEAK_SYMBOL __attribute__(( weak )) 653+#define QT_WEAK_SYMBOL __attribute__(( weak ))
382+ 654+
383 #include "qfontdatabase.h" 655 #include "qfontdatabase.h"
384 656
385 #ifndef QT_NO_FONTDATABASE 657 #ifndef QT_NO_FONTDATABASE
386@@ -2421,6 +2423,13 @@ 658@@ -2421,6 +2423,13 @@
387 */ 659 */
388 660
389 QValueList<int> QFontDatabase::pointSizes( const QString &family, 661 QValueList<int> QFontDatabase::pointSizes( const QString &family,
390+ const QString &style, 662+ const QString &style,
391+ const QString &charSet ) 663+ const QString &charSet )
392+{ 664+{
393 +return pointSizes_NonWeak ( family, style, charSet ); 665 +return pointSizes_NonWeak ( family, style, charSet );
394+} 666+}
395+ 667+
396+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, 668+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family,
397 const QString &style, 669 const QString &style,
398 const QString &charSet ) 670 const QString &charSet )
399 { 671 {
400diff -ru qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h 672diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h
401 --- qt-2.3.7/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003 673 --- qt-2.3.7/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003
402 +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003 674 +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003
403@@ -59,6 +59,10 @@ 675@@ -59,6 +59,10 @@
404 class QDiskFont; 676 class QDiskFont;
405 #endif 677 #endif
406 678
407+#if !defined( QT_WEAK_SYMBOL ) 679+#if !defined( QT_WEAK_SYMBOL )
408+#define QT_WEAK_SYMBOL 680+#define QT_WEAK_SYMBOL
409+#endif 681+#endif
410+ 682+
411 class QFontDatabasePrivate; 683 class QFontDatabasePrivate;
412 684
413 class Q_EXPORT QFontDatabase 685 class Q_EXPORT QFontDatabase
414@@ -67,9 +71,16 @@ 686@@ -67,9 +71,16 @@
415 QFontDatabase(); 687 QFontDatabase();
416 688
417 QStringList families( bool onlyForLocale = TRUE ) const; 689 QStringList families( bool onlyForLocale = TRUE ) const;
418+ 690+
419+ 691+
420 QValueList<int> pointSizes( const QString &family, 692 QValueList<int> pointSizes( const QString &family,
421 const QString &style = QString::null, 693 const QString &style = QString::null,
422 - const QString &charSet = QString::null ); 694 - const QString &charSet = QString::null );
423 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; 695 + const QString &charSet = QString::null ) QT_WEAK_SYMBOL;
424+private: 696+private:
425+ QValueList<int> pointSizes_NonWeak( const QString &family, 697+ QValueList<int> pointSizes_NonWeak( const QString &family,
426 + const QString &style, 698 + const QString &style,
427 + const QString &charSet ); 699 + const QString &charSet );
428+public: 700+public:
429 QStringList styles( const QString &family, 701 QStringList styles( const QString &family,
430 const QString &charSet = QString::null ) const; 702 const QString &charSet = QString::null ) const;
431 QStringList charSets( const QString &familyName, 703 QStringList charSets( const QString &familyName,
432diff -ru qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp 704diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp
433 --- qt-2.3.7/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003 705 --- qt-2.3.7/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003
434 +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003 706 +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003
435@@ -32,7 +32,7 @@ 707@@ -32,7 +32,7 @@
436 #include "qgfx_qws.h" 708 #include "qgfx_qws.h"
437 709
438 #include <stdio.h> 710 #include <stdio.h>
439-#include <dlfcn.h> 711-#include <dlfcn.h>
440+//#include <dlfcn.h> 712+//#include <dlfcn.h>
441 #include <sys/types.h> 713 #include <sys/types.h>
442 #include <dirent.h> 714 #include <dirent.h>
443 #include <stdlib.h> 715 #include <stdlib.h>
444diff -ru qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp 716diff -uNr --exclude-from=./diff_ignore qt-2.3.7/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 717 --- qt-2.3.7/src/kernel/qgfxraster_qws.cppThu Jul 17 03:20:25 2003
446 +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003 718 +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003
447@@ -75,7 +75,11 @@ 719@@ -75,7 +75,11 @@
448 # if __BYTE_ORDER == __BIG_ENDIAN 720 # if __BYTE_ORDER == __BIG_ENDIAN
449 # define QWS_BIG_ENDIAN 721 # define QWS_BIG_ENDIAN
450 # endif 722 # endif
451+#elif defined(__APPLE__) 723+#elif defined(__APPLE__)
452+# define QWS_BIG_ENDIAN 724+# define QWS_BIG_ENDIAN
453 #endif 725 #endif
454+// AJ: the above (test for __APPLE__) is very hacky, but I can't 726+// AJ: the above (test for __APPLE__) is very hacky, but I can't
455+// think of something better at the moment. 727+// think of something better at the moment.
456 728
457 // Pull this private function in from qglobal.cpp 729 // Pull this private function in from qglobal.cpp
458 extern unsigned int qt_int_sqrt( unsigned int n ); 730 extern unsigned int qt_int_sqrt( unsigned int n );
459@@ -3770,6 +3774,19 @@ 731@@ -3770,6 +3774,19 @@
460 b = srcval & 0xff; 732 b = srcval & 0xff;
@@ -489,33 +761,33 @@ diff -ru qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_
489 } else if ( depth == 1 ) { 761 } else if ( depth == 1 ) {
490 if (srctype==SourceImage) { 762 if (srctype==SourceImage) {
491 - static int warn; 763 - static int warn;
492 + static int warn = 0; 764 + static int warn = 0;
493 if ( warn++ < 5 ) 765 if ( warn++ < 5 )
494 qDebug( "bitmap alpha-image not implemented" ); 766 qDebug( "bitmap alpha-image not implemented" );
495 hImageLineUnclipped( x1, x2, l, srcdata, FALSE ); 767 hImageLineUnclipped( x1, x2, l, srcdata, FALSE );
496@@ -4237,7 +4255,7 @@ 768@@ -4237,7 +4255,7 @@
497 setAlphaType(IgnoreAlpha); 769 setAlphaType(IgnoreAlpha);
498 if ( w <= 0 || h <= 0 || !ncliprect ) return; 770 if ( w <= 0 || h <= 0 || !ncliprect ) return;
499 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) 771 GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1))
500-#ifdef QWS_EXPERIMENTAL_FASTPATH 772-#ifdef QWS_EXPERIMENTAL_FASTPATH
501+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! 773+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !!
502 // ### fix for 8bpp 774 // ### fix for 8bpp
503 // This seems to be reliable now, at least for 16bpp 775 // This seems to be reliable now, at least for 16bpp
504 776
505diff -ru qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp 777diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp
506 --- qt-2.3.7/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003 778 --- qt-2.3.7/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003
507 +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003 779 +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003
508@@ -69,7 +69,7 @@ 780@@ -69,7 +69,7 @@
509 #if !defined(_OS_QNX6_) 781 #if !defined(_OS_QNX6_)
510 782
511 #include <termios.h> 783 #include <termios.h>
512-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 784-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
513+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 785+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
514 #include <sys/kd.h> 786 #include <sys/kd.h>
515 #include <sys/vt.h> 787 #include <sys/vt.h>
516 #endif 788 #endif
517@@ -468,10 +468,12 @@ 789@@ -468,10 +468,12 @@
518 void QWSPC101KeyboardHandler::restoreLeds() 790 void QWSPC101KeyboardHandler::restoreLeds()
519 { 791 {
520 char leds; 792 char leds;
521+#if !defined(_OS_MACX_) 793+#if !defined(_OS_MACX_)
@@ -559,45 +831,83 @@ diff -ru qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qw
559 signal(VTSWITCHSIG, vtSwitchHandler); 831 signal(VTSWITCHSIG, vtSwitchHandler);
560 832
561-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 833-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
562+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 834+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
563 struct vt_mode vtMode; 835 struct vt_mode vtMode;
564 ioctl(kbdFD, VT_GETMODE, &vtMode); 836 ioctl(kbdFD, VT_GETMODE, &vtMode);
565 837
566@@ -1068,7 +1070,7 @@ 838@@ -1068,7 +1070,7 @@
567 { 839 {
568 if (kbdFD >= 0) 840 if (kbdFD >= 0)
569 { 841 {
570-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 842-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
571+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 843+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
572 ioctl(kbdFD, KDSKBMODE, K_XLATE); 844 ioctl(kbdFD, KDSKBMODE, K_XLATE);
573 #endif 845 #endif
574 tcsetattr(kbdFD, TCSANOW, &origTermData); 846 tcsetattr(kbdFD, TCSANOW, &origTermData);
575diff -ru qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp 847diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qkeyboard_qws.cpp.rej qte-2.3.7/src/kernel/qkeyboard_qws.cpp.rej
848 --- qt-2.3.7/src/kernel/qkeyboard_qws.cpp.rejThu Jan 1 01:00:00 1970
849 +++ qte-2.3.7/src/kernel/qkeyboard_qws.cpp.rejMon Oct 27 14:27:25 2003
850@@ -0,0 +1,34 @@
851+***************
852+*** 1023,1029 ****
853+ struct termios termdata;
854+ tcgetattr( kbdFD, &termdata );
855+
856+- #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
857+ ioctl(kbdFD, KDSKBMODE, K_RAW);
858+ #endif
859+
860+--- 1023,1029 ----
861+ struct termios termdata;
862+ tcgetattr( kbdFD, &termdata );
863+
864++ #if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
865+ ioctl(kbdFD, KDSKBMODE, K_RAW);
866+ #endif
867+
868+***************
869+*** 1039,1045 ****
870+
871+ signal(VTSWITCHSIG, vtSwitchHandler);
872+
873+- #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
874+ struct vt_mode vtMode;
875+ ioctl(kbdFD, VT_GETMODE, &vtMode);
876+
877+--- 1039,1045 ----
878+
879+ signal(VTSWITCHSIG, vtSwitchHandler);
880+
881++ #if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
882+ struct vt_mode vtMode;
883+ ioctl(kbdFD, VT_GETMODE, &vtMode);
884+
885diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp
576 --- qt-2.3.7/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003 886 --- qt-2.3.7/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003
577 +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003 887 +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003
578@@ -38,7 +38,7 @@ 888@@ -38,7 +38,7 @@
579 #include <errno.h> 889 #include <errno.h>
580 890
581 #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \ 891 #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \
582- || defined _OS_FREEBSD_ 892- || defined _OS_FREEBSD_
583+ || defined(_OS_FREEBSD_) || defined(_OS_MACX_) 893+ || defined(_OS_FREEBSD_) || defined(_OS_MACX_)
584 /* union semun is defined by including <sys/sem.h> */ 894 /* union semun is defined by including <sys/sem.h> */
585 #else 895 #else
586 /* according to X/OPEN we have to define it ourselves */ 896 /* according to X/OPEN we have to define it ourselves */
587diff -ru qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp 897diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp
588 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003 898 --- qt-2.3.7/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003
589 +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003 899 +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003
590@@ -844,6 +844,18 @@ 900@@ -844,6 +844,18 @@
591 { 901 {
592 } 902 }
593 903
594+static void catchSegvSignal( int ) 904+static void catchSegvSignal( int )
595+{ 905+{
596+#ifndef QT_NO_QWS_KEYBOARD 906+#ifndef QT_NO_QWS_KEYBOARD
597+ if ( qwsServer ) 907+ if ( qwsServer )
598 +qwsServer->closeKeyboard(); 908 +qwsServer->closeKeyboard();
599+#endif 909+#endif
600+ QWSServer::closedown(); 910+ QWSServer::closedown();
601+ fprintf(stderr, "Segmentation fault.\n"); 911+ fprintf(stderr, "Segmentation fault.\n");
602+ exit(1); 912+ exit(1);
603+} 913+}
@@ -610,68 +920,173 @@ diff -ru qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindows
610 } 920 }
611 921
612 signal(SIGPIPE, ignoreSignal); //we get it when we read 922 signal(SIGPIPE, ignoreSignal); //we get it when we read
613+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash 923+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash
614 #endif 924 #endif
615 focusw = 0; 925 focusw = 0;
616 mouseGrabber = 0; 926 mouseGrabber = 0;
617@@ -950,7 +963,7 @@ 927@@ -950,7 +963,7 @@
618 928
619 #ifndef QT_NO_QWS_MULTIPROCESS 929 #ifndef QT_NO_QWS_MULTIPROCESS
620 if ( !geteuid() ) { 930 if ( !geteuid() ) {
621-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 931-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
622+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 932+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
623 if( mount(0, "/var/shm", "shm", 0, 0) ) { 933 if( mount(0, "/var/shm", "shm", 0, 0) ) {
624 /* This just confuses people with 2.2 kernels 934 /* This just confuses people with 2.2 kernels
625 if ( errno != EBUSY ) 935 if ( errno != EBUSY )
626diff -ru qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp 936diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp
627 --- qt-2.3.7/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003 937 --- qt-2.3.7/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003
628 +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003 938 +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003
629@@ -336,7 +336,7 @@ 939@@ -336,7 +336,7 @@
630 tty.c_oflag = 0; 940 tty.c_oflag = 0;
631 tty.c_lflag = 0; 941 tty.c_lflag = 0;
632 tty.c_cflag = f | CREAD | CLOCAL | HUPCL; 942 tty.c_cflag = f | CREAD | CLOCAL | HUPCL;
633-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 943-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
634+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 944+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
635 tty.c_line = 0; 945 tty.c_line = 0;
636 #endif 946 #endif
637 tty.c_cc[VTIME] = 0; 947 tty.c_cc[VTIME] = 0;
638@@ -889,7 +889,7 @@ 948@@ -889,7 +889,7 @@
639 tty.c_iflag = IGNBRK | IGNPAR; 949 tty.c_iflag = IGNBRK | IGNPAR;
640 tty.c_oflag = 0; 950 tty.c_oflag = 0;
641 tty.c_lflag = 0; 951 tty.c_lflag = 0;
642-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 952-#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
643+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) 953+#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_)
644 tty.c_line = 0; 954 tty.c_line = 0;
645 #endif // _OS_FREEBSD_ 955 #endif // _OS_FREEBSD_
646 tty.c_cc[VTIME] = 0; 956 tty.c_cc[VTIME] = 0;
647diff -ru qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp 957Binary files qt-2.3.7/src/moc/moc and qte-2.3.7/src/moc/moc differ
958diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp
648 --- qt-2.3.7/src/network/qdns.cppThu Jul 17 03:20:26 2003 959 --- qt-2.3.7/src/network/qdns.cppThu Jul 17 03:20:26 2003
649 +++ qte-2.3.7/src/network/qdns.cppSun Nov 16 13:44:27 2003 960 +++ qte-2.3.7/src/network/qdns.cppSun Nov 16 13:44:27 2003
650@@ -1991,7 +1991,7 @@ 961@@ -1991,7 +1991,7 @@
651 domains = new QStrList( TRUE ); 962 domains = new QStrList( TRUE );
652 domains->setAutoDelete( TRUE ); 963 domains->setAutoDelete( TRUE );
653 964
654- res_init(); 965- res_init();
655+ // res_init(); (eilers: Caused link problems) 966+ // res_init(); (eilers: Caused link problems)
656 int i; 967 int i;
657 // find the name servers to use 968 // find the name servers to use
658 for( i=0; i < MAXNS && i < _res.nscount; i++ ) { 969 for( i=0; i < MAXNS && i < _res.nscount; i++ ) {
659diff -ru qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h 970diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/tools/qconfig-qpe.h qte-2.3.7/src/tools/qconfig-qpe.h
971 --- qt-2.3.7/src/tools/qconfig-qpe.hThu Jan 1 01:00:00 1970
972 +++ qte-2.3.7/src/tools/qconfig-qpe.hSun Dec 14 12:48:43 2003
973@@ -0,0 +1,100 @@
974+/**********************************************************************
975+** Copyright (C) 2000 Trolltech AS. All rights reserved.
976+**
977+** This file is part of Qtopia Environment.
978+**
979+** This file may be distributed and/or modified under the terms of the
980+** GNU General Public License version 2 as published by the Free Software
981+** Foundation and appearing in the file LICENSE.GPL included in the
982+** packaging of this file.
983+**
984+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
985+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
986+**
987+** See http://www.trolltech.com/gpl/ for GPL licensing information.
988+**
989+** Contact info@trolltech.com if any conditions of this licensing are
990+** not clear to you.
991+**
992+**********************************************************************/
993+#ifndef QT_H
994+#endif // QT_H
995+
996+// Empty leaves all features enabled. See doc/html/features.html for choices.
997+
998+// Note that disabling some features will produce a libqt that is not
999+// compatible with other libqt builds. Such modifications are only
1000+// supported on Qt/Embedded where reducing the library size is important
1001+// and where the application-suite is often a fixed set.
1002+
1003+#ifndef QT_DLL
1004+#define QT_DLL // Internal
1005+#endif
1006+
1007+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX)
1008+# define QT_NO_QWS_CURSOR
1009+# define QT_NO_QWS_MOUSE_AUTO
1010+#endif
1011+#ifndef QT_NO_CODECS
1012+#define QT_NO_CODECS
1013+#endif
1014+#define QT_NO_UNICODETABLES
1015+//#define QT_NO_IMAGEIO_BMP
1016+#define QT_NO_IMAGEIO_PPM
1017+//#define QT_NO_ASYNC_IO
1018+//#define QT_NO_ASYNC_IMAGE_IO
1019+#define QT_NO_FREETYPE
1020+#define QT_NO_BDF
1021+//#define QT_NO_FONTDATABASE
1022+#define QT_NO_DRAGANDDROP
1023+//#define QT_NO_CLIPBOARD
1024+#define QT_NO_PROPERTIES
1025+#define QT_NO_NETWORKPROTOCOL
1026+
1027+#define QT_NO_IMAGE_TEXT
1028+
1029+//#define QT_NO_TOOLTIP
1030+#define QT_NO_COLORNAMES
1031+#define QT_NO_TRANSFORMATIONS
1032+#define QT_NO_TRANSLATION_BUILDER
1033+#define QT_NO_COMPLEXTEXT
1034+#define QT_NO_PRINTER
1035+#define QT_NO_PICTURE
1036+//#define QT_NO_ICONVIEW
1037+#define QT_NO_DIAL
1038+#define QT_NO_SIZEGRIP
1039+#define QT_NO_WORKSPACE
1040+//#define QT_NO_TABLE
1041+//#define QT_NO_ACTION
1042+//#define QT_NO_SETTINGS
1043+#define QT_NO_STYLE_POCKETPC
1044+#ifndef QT_NO_STYLE_AQUA
1045+# define QT_NO_STYLE_AQUA
1046+#endif
1047+#define QT_NO_STYLE_MOTIF
1048+#define QT_NO_STYLE_PLATINUM
1049+#define QT_NO_FILEDIALOG
1050+#define QT_NO_FONTDIALOG
1051+#define QT_NO_PRINTDIALOG
1052+#define QT_NO_COLORDIALOG
1053+#define QT_NO_INPUTDIALOG
1054+//#define QT_NO_MESSAGEBOX
1055+#define QT_NO_PROGRESSDIALOG
1056+//#define QT_NO_TABDIALOG
1057+#define QT_NO_WIZARD
1058+#define QT_NO_EFFECTS
1059+//#define QT_NO_COMPONENT
1060+#define QT_NO_DOM
1061+#define QT_NO_SEMIMODAL
1062+//#define QT_NO_PROGRESSBAR
1063+#define QT_NO_SPLITTER
1064+
1065+//#define QT_NO_QWS_SAVEFONTS
1066+//#define QT_NO_QWS_PROPERTIES
1067+
1068+#define QT_NO_QWS_BEOS_WM_STYLE
1069+#define QT_NO_QWS_KDE2_WM_STYLE
1070+#define QT_NO_QWS_KDE_WM_STYLE
1071+#define QT_NO_QWS_WINDOWS_WM_STYLE
1072+
1073+#define QT_NO_SOUND
1074diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h
660 --- qt-2.3.7/src/tools/qconfig.hFri Jan 26 14:43:06 2001 1075 --- qt-2.3.7/src/tools/qconfig.hFri Jan 26 14:43:06 2001
661 +++ qte-2.3.7/src/tools/qconfig.hSun Nov 16 13:35:10 2003 1076 +++ qte-2.3.7/src/tools/qconfig.hThu Dec 11 12:54:20 2003
662@@ -1,3 +1,26 @@ 1077@@ -1,3 +1,26 @@
663+// Copied from qconfig-qpe.h 1078+// Copied from qconfig-qpe.h
664+/********************************************************************** 1079+/**********************************************************************
665+** Copyright (C) 2000 Trolltech AS. All rights reserved. 1080+** Copyright (C) 2000 Trolltech AS. All rights reserved.
666+** 1081+**
667+** This file is part of Qtopia Environment. 1082+** This file is part of Qtopia Environment.
668+** 1083+**
669+** This file may be distributed and/or modified under the terms of the 1084+** This file may be distributed and/or modified under the terms of the
670+** GNU General Public License version 2 as published by the Free Software 1085+** GNU General Public License version 2 as published by the Free Software
671+** Foundation and appearing in the file LICENSE.GPL included in the 1086+** Foundation and appearing in the file LICENSE.GPL included in the
672+** packaging of this file. 1087+** packaging of this file.
673+** 1088+**
674+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 1089+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
675+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 1090+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
676+** 1091+**
677+** See http://www.trolltech.com/gpl/ for GPL licensing information. 1092+** See http://www.trolltech.com/gpl/ for GPL licensing information.
@@ -746,96 +1161,102 @@ diff -ru qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h
746+//#define QT_NO_COMPONENT 1161+//#define QT_NO_COMPONENT
747+#define QT_NO_DOM 1162+#define QT_NO_DOM
748+#define QT_NO_SEMIMODAL 1163+#define QT_NO_SEMIMODAL
749+//#define QT_NO_PROGRESSBAR 1164+//#define QT_NO_PROGRESSBAR
750+#define QT_NO_SPLITTER 1165+#define QT_NO_SPLITTER
751+ 1166+
752+//#define QT_NO_QWS_SAVEFONTS 1167+//#define QT_NO_QWS_SAVEFONTS
753+//#define QT_NO_QWS_PROPERTIES 1168+//#define QT_NO_QWS_PROPERTIES
754+ 1169+
755+#define QT_NO_QWS_BEOS_WM_STYLE 1170+#define QT_NO_QWS_BEOS_WM_STYLE
756+#define QT_NO_QWS_KDE2_WM_STYLE 1171+#define QT_NO_QWS_KDE2_WM_STYLE
757+#define QT_NO_QWS_KDE_WM_STYLE 1172+#define QT_NO_QWS_KDE_WM_STYLE
758+#define QT_NO_QWS_WINDOWS_WM_STYLE 1173+#define QT_NO_QWS_WINDOWS_WM_STYLE
759+ 1174+
760+#define QT_NO_SOUND 1175+#define QT_NO_SOUND
761\ No newline at end of file 1176\ No newline at end of file
762diff -ru qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h 1177diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h
763 --- qt-2.3.7/src/tools/qmodules.hFri Aug 31 17:00:56 2001 1178 --- qt-2.3.7/src/tools/qmodules.hFri Aug 31 17:00:56 2001
764 +++ qte-2.3.7/src/tools/qmodules.hSun Nov 16 13:34:58 2003 1179 +++ qte-2.3.7/src/tools/qmodules.hThu Dec 11 12:53:57 2003
765@@ -1,14 +1,12 @@ 1180@@ -1,14 +1,12 @@
766-#ifndef QT_H 1181-#ifndef QT_H
767-#endif // QT_H 1182-#endif // QT_H
768- 1183-
769+// These modules are licensed to you 1184+// These modules are licensed to you
770 #define QT_MODULE_TOOLS 1185 #define QT_MODULE_TOOLS
771 #define QT_MODULE_KERNEL 1186 #define QT_MODULE_KERNEL
772 #define QT_MODULE_WIDGETS 1187 #define QT_MODULE_WIDGETS
773 #define QT_MODULE_DIALOGS 1188 #define QT_MODULE_DIALOGS
774- 1189-
775 #define QT_MODULE_ICONVIEW 1190 #define QT_MODULE_ICONVIEW
776 #define QT_MODULE_WORKSPACE 1191 #define QT_MODULE_WORKSPACE
777-#define QT_MODULE_TABLE 1192-#define QT_MODULE_TABLE
778+#define QT_MODULE_NETWORK 1193+#define QT_MODULE_NETWORK
779 #define QT_MODULE_CANVAS 1194 #define QT_MODULE_CANVAS
780+#define QT_MODULE_TABLE 1195+#define QT_MODULE_TABLE
781 #define QT_MODULE_XML 1196 #define QT_MODULE_XML
782-#define QT_MODULE_NETWORK 1197-#define QT_MODULE_NETWORK
783+#define QT_MODULE_OPENGL 1198+#define QT_MODULE_OPENGL
784diff -ru qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp 1199diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp
785 --- qt-2.3.7/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003 1200 --- qt-2.3.7/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003
786 +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003 1201 +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003
787@@ -566,7 +566,7 @@ 1202@@ -566,7 +566,7 @@
788 bool enabled, bool active ) 1203 bool enabled, bool active )
789 { 1204 {
790 #ifndef QT_NO_MENUBAR 1205 #ifndef QT_NO_MENUBAR
791-#ifndef QT_NO_STYLE_SGI 1206-#ifndef QT_NO_STYLE_SGI
792+#if 1 // #ifndef QT_NO_STYLE_SGI 1207+#if 1 // #ifndef QT_NO_STYLE_SGI
793 if (draw_menu_bar_impl != 0) { 1208 if (draw_menu_bar_impl != 0) {
794 QDrawMenuBarItemImpl impl = draw_menu_bar_impl; 1209 QDrawMenuBarItemImpl impl = draw_menu_bar_impl;
795 (this->*impl)(p, x, y, w, h, mi, g, enabled, active); 1210 (this->*impl)(p, x, y, w, h, mi, g, enabled, active);
796diff -ru qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp 1211diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp
797 --- qt-2.3.7/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003 1212 --- qt-2.3.7/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003
798 +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003 1213 +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003
799@@ -4968,9 +4968,9 @@ 1214@@ -4968,9 +4968,9 @@
800 l = l->childItem ? l->childItem : l->siblingItem; 1215 l = l->childItem ? l->childItem : l->siblingItem;
801 1216
802 if ( l && l->height() ) 1217 if ( l && l->height() )
803 -s.setHeight( s.height() + 10 * l->height() ); 1218 -s.setHeight( s.height() + 10 * l->height() );
804- else 1219- else
805 -s.setHeight( s.height() + 140 ); 1220 -s.setHeight( s.height() + 140 );
806 +s.setHeight( s.height() + 4 /*10*/ * l->height() ); 1221 +s.setHeight( s.height() + 4 /*10*/ * l->height() );
807+ else // ^v much too big for handhelds 1222+ else // ^v much too big for handhelds
808 +s.setHeight( s.height() + 30 /*140*/ ); 1223 +s.setHeight( s.height() + 30 /*140*/ );
809 1224
810 if ( s.width() > s.height() * 3 ) 1225 if ( s.width() > s.height() * 3 )
811 s.setHeight( s.width() / 3 ); 1226 s.setHeight( s.width() / 3 );
812diff -ru qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp 1227diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp
813 --- qt-2.3.7/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003 1228 --- qt-2.3.7/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003
814 +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003 1229 +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003
815@@ -230,7 +230,7 @@ 1230@@ -230,7 +230,7 @@
816 else 1231 else
817 QToolTip::add( this, textLabel ); 1232 QToolTip::add( this, textLabel );
818 } 1233 }
819 -#endif 1234 -#endif
820+#endif 1235+#endif
821 } 1236 }
822 1237
823 1238
824@@ -324,12 +324,12 @@ 1239@@ -324,12 +324,12 @@
825 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); 1240 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal);
826 w = pm.width(); 1241 w = pm.width();
827 h = pm.height(); 1242 h = pm.height();
828 -if ( w < 32 ) 1243 -if ( w < 32 )
829 - w = 32; 1244 - w = 32;
830 -if ( h < 32 ) 1245 -if ( h < 32 )
831 - h = 32; 1246 - h = 32;
832 +if ( w < 24 ) 1247 +if ( w < 24 )
833 + w = 24; 1248 + w = 24;
834 +if ( h < 24 ) 1249 +if ( h < 24 )
835 + h = 24; 1250 + h = 24;
836 } else { 1251 } else {
837 -w = h = 16; 1252 -w = h = 16;
838 +w = h = 14; 1253 +w = h = 14;
839 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); 1254 QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal);
840 w = pm.width(); 1255 w = pm.width();
841 h = pm.height(); 1256 h = pm.height();
1257diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src-mt.mk qte-2.3.7/src-mt.mk
1258 --- qt-2.3.7/src-mt.mkThu Jan 1 01:00:00 1970
1259 +++ qte-2.3.7/src-mt.mkThu Dec 11 12:53:57 2003
1260@@ -0,0 +1,2 @@
1261+all:
1262 +@echo "(not building threaded Qt)"