Diffstat (limited to 'qt/qt-2.3.7.patch/qte237-all-macosx.patch') (more/less context) (ignore whitespace changes)
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all-macosx.patch | 1262 |
1 files changed, 0 insertions, 1262 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 deleted file mode 100644 index 8e42396..0000000 --- a/qt/qt-2.3.7.patch/qte237-all-macosx.patch +++ b/dev/null | |||
@@ -1,1262 +0,0 @@ | |||
1 | Binary files qt-2.3.7/bin/moc and qte-2.3.7/bin/moc differ | ||
2 | Binary files qt-2.3.7/bin/uic and qte-2.3.7/bin/uic differ | ||
3 | diff -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= | ||
105 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h | ||
106 | --- qt-2.3.7/include/qapplication.hThu Jul 17 03:20:25 2003 | ||
107 | +++ qte-2.3.7/include/qapplication.hMon Oct 27 14:21:28 2003 | ||
108 | @@ -61,6 +61,10 @@ | ||
109 | class QSemaphore; | ||
110 | #endif | ||
111 | |||
112 | +#if !defined( QT_WEAK_SYMBOL ) | ||
113 | +#define QT_WEAK_SYMBOL | ||
114 | +#endif | ||
115 | + | ||
116 | // REMOVE IN 3.0 (just here for moc source compatibility) | ||
117 | #define QNonBaseApplication QApplication | ||
118 | |||
119 | @@ -85,7 +89,10 @@ | ||
120 | |||
121 | #ifndef QT_NO_STYLE | ||
122 | static QStyle &style(); | ||
123 | - static void setStyle( QStyle* ); | ||
124 | + static void setStyle( QStyle* ) QT_WEAK_SYMBOL; | ||
125 | +private: | ||
126 | +static void setStyle_NonWeak( QStyle* ); | ||
127 | +public: | ||
128 | #endif | ||
129 | #if 1/* OBSOLETE */ | ||
130 | enum ColorMode { NormalColors, CustomColors }; | ||
131 | @@ -106,11 +113,19 @@ | ||
132 | #ifndef QT_NO_PALETTE | ||
133 | static QPalette palette( const QWidget* = 0 ); | ||
134 | static void setPalette( const QPalette &, bool informWidgets=FALSE, | ||
135 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
136 | +private: | ||
137 | + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, | ||
138 | const char* className = 0 ); | ||
139 | +public: | ||
140 | #endif | ||
141 | static QFont font( const QWidget* = 0 ); | ||
142 | static void setFont( const QFont &, bool informWidgets=FALSE, | ||
143 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
144 | +private: | ||
145 | + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, | ||
146 | const char* className = 0 ); | ||
147 | +public: | ||
148 | static QFontMetrics fontMetrics(); | ||
149 | |||
150 | QWidget *mainWidget() const; | ||
151 | @@ -207,7 +222,10 @@ | ||
152 | void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); | ||
153 | #ifndef QT_NO_QWS_MANAGER | ||
154 | static QWSDecoration &qwsDecoration(); | ||
155 | - static void qwsSetDecoration( QWSDecoration *); | ||
156 | + static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; | ||
157 | +private: | ||
158 | + static void qwsSetDecoration_NonWeak( QWSDecoration *); | ||
159 | +public: | ||
160 | #endif | ||
161 | #endif | ||
162 | |||
163 | diff -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 | ||
267 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h | ||
268 | --- qt-2.3.7/include/qconfig.hFri Jan 26 14:43:06 2001 | ||
269 | +++ qte-2.3.7/include/qconfig.hThu Dec 11 12:54:20 2003 | ||
270 | @@ -1,3 +1,26 @@ | ||
271 | +// Copied from qconfig-qpe.h | ||
272 | +/********************************************************************** | ||
273 | +** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
274 | +** | ||
275 | +** This file is part of Qtopia Environment. | ||
276 | +** | ||
277 | +** This file may be distributed and/or modified under the terms of the | ||
278 | +** GNU General Public License version 2 as published by the Free Software | ||
279 | +** Foundation and appearing in the file LICENSE.GPL included in the | ||
280 | +** packaging of this file. | ||
281 | +** | ||
282 | +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
283 | +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
284 | +** | ||
285 | +** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
286 | +** | ||
287 | +** Contact info@trolltech.com if any conditions of this licensing are | ||
288 | +** not clear to you. | ||
289 | +** | ||
290 | +**********************************************************************/ | ||
291 | +#ifndef QT_H | ||
292 | +#endif // QT_H | ||
293 | + | ||
294 | // Empty leaves all features enabled. See doc/html/features.html for choices. | ||
295 | |||
296 | // Note that disabling some features will produce a libqt that is not | ||
297 | @@ -8,3 +31,71 @@ | ||
298 | #ifndef QT_DLL | ||
299 | #define QT_DLL // Internal | ||
300 | #endif | ||
301 | + | ||
302 | +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | ||
303 | +# define QT_NO_QWS_CURSOR | ||
304 | +# define QT_NO_QWS_MOUSE_AUTO | ||
305 | +#endif | ||
306 | +#ifndef QT_NO_CODECS | ||
307 | +#define QT_NO_CODECS | ||
308 | +#endif | ||
309 | +#define QT_NO_UNICODETABLES | ||
310 | +//#define QT_NO_IMAGEIO_BMP | ||
311 | +#define QT_NO_IMAGEIO_PPM | ||
312 | +//#define QT_NO_ASYNC_IO | ||
313 | +//#define QT_NO_ASYNC_IMAGE_IO | ||
314 | +#define QT_NO_FREETYPE | ||
315 | +#define QT_NO_BDF | ||
316 | +//#define QT_NO_FONTDATABASE | ||
317 | +#define QT_NO_DRAGANDDROP | ||
318 | +//#define QT_NO_CLIPBOARD | ||
319 | +#define QT_NO_PROPERTIES | ||
320 | +#define QT_NO_NETWORKPROTOCOL | ||
321 | + | ||
322 | +#define QT_NO_IMAGE_TEXT | ||
323 | + | ||
324 | +//#define QT_NO_TOOLTIP | ||
325 | +#define QT_NO_COLORNAMES | ||
326 | +#define QT_NO_TRANSFORMATIONS | ||
327 | +#define QT_NO_TRANSLATION_BUILDER | ||
328 | +#define QT_NO_COMPLEXTEXT | ||
329 | +#define QT_NO_PRINTER | ||
330 | +#define QT_NO_PICTURE | ||
331 | +//#define QT_NO_ICONVIEW | ||
332 | +#define QT_NO_DIAL | ||
333 | +#define QT_NO_SIZEGRIP | ||
334 | +#define QT_NO_WORKSPACE | ||
335 | +//#define QT_NO_TABLE | ||
336 | +//#define QT_NO_ACTION | ||
337 | +//#define QT_NO_SETTINGS | ||
338 | +#define QT_NO_STYLE_POCKETPC | ||
339 | +#ifndef QT_NO_STYLE_AQUA | ||
340 | +# define QT_NO_STYLE_AQUA | ||
341 | +#endif | ||
342 | +#define QT_NO_STYLE_MOTIF | ||
343 | +#define QT_NO_STYLE_PLATINUM | ||
344 | +#define QT_NO_FILEDIALOG | ||
345 | +#define QT_NO_FONTDIALOG | ||
346 | +#define QT_NO_PRINTDIALOG | ||
347 | +#define QT_NO_COLORDIALOG | ||
348 | +#define QT_NO_INPUTDIALOG | ||
349 | +//#define QT_NO_MESSAGEBOX | ||
350 | +#define QT_NO_PROGRESSDIALOG | ||
351 | +//#define QT_NO_TABDIALOG | ||
352 | +#define QT_NO_WIZARD | ||
353 | +#define QT_NO_EFFECTS | ||
354 | +//#define QT_NO_COMPONENT | ||
355 | +#define QT_NO_DOM | ||
356 | +#define QT_NO_SEMIMODAL | ||
357 | +//#define QT_NO_PROGRESSBAR | ||
358 | +#define QT_NO_SPLITTER | ||
359 | + | ||
360 | +//#define QT_NO_QWS_SAVEFONTS | ||
361 | +//#define QT_NO_QWS_PROPERTIES | ||
362 | + | ||
363 | +#define QT_NO_QWS_BEOS_WM_STYLE | ||
364 | +#define QT_NO_QWS_KDE2_WM_STYLE | ||
365 | +#define QT_NO_QWS_KDE_WM_STYLE | ||
366 | +#define QT_NO_QWS_WINDOWS_WM_STYLE | ||
367 | + | ||
368 | +#define QT_NO_SOUND | ||
369 | \ No newline at end of file | ||
370 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h | ||
371 | --- qt-2.3.7/include/qfontdatabase.hThu Jul 17 03:20:25 2003 | ||
372 | +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003 | ||
373 | @@ -59,6 +59,10 @@ | ||
374 | class QDiskFont; | ||
375 | #endif | ||
376 | |||
377 | +#if !defined( QT_WEAK_SYMBOL ) | ||
378 | +#define QT_WEAK_SYMBOL | ||
379 | +#endif | ||
380 | + | ||
381 | class QFontDatabasePrivate; | ||
382 | |||
383 | class Q_EXPORT QFontDatabase | ||
384 | @@ -67,9 +71,16 @@ | ||
385 | QFontDatabase(); | ||
386 | |||
387 | QStringList families( bool onlyForLocale = TRUE ) const; | ||
388 | + | ||
389 | + | ||
390 | QValueList<int> pointSizes( const QString &family, | ||
391 | const QString &style = QString::null, | ||
392 | - const QString &charSet = QString::null ); | ||
393 | + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; | ||
394 | +private: | ||
395 | + QValueList<int> pointSizes_NonWeak( const QString &family, | ||
396 | + const QString &style, | ||
397 | + const QString &charSet ); | ||
398 | +public: | ||
399 | QStringList styles( const QString &family, | ||
400 | const QString &charSet = QString::null ) const; | ||
401 | QStringList charSets( const QString &familyName, | ||
402 | diff -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 | ||
462 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h | ||
463 | --- qt-2.3.7/include/qmodules.hFri Aug 31 17:00:56 2001 | ||
464 | +++ qte-2.3.7/include/qmodules.hThu Dec 11 12:53:57 2003 | ||
465 | @@ -1,14 +1,12 @@ | ||
466 | -#ifndef QT_H | ||
467 | -#endif // QT_H | ||
468 | - | ||
469 | +// These modules are licensed to you | ||
470 | #define QT_MODULE_TOOLS | ||
471 | #define QT_MODULE_KERNEL | ||
472 | #define QT_MODULE_WIDGETS | ||
473 | #define QT_MODULE_DIALOGS | ||
474 | - | ||
475 | #define QT_MODULE_ICONVIEW | ||
476 | #define QT_MODULE_WORKSPACE | ||
477 | -#define QT_MODULE_TABLE | ||
478 | +#define QT_MODULE_NETWORK | ||
479 | #define QT_MODULE_CANVAS | ||
480 | +#define QT_MODULE_TABLE | ||
481 | #define QT_MODULE_XML | ||
482 | -#define QT_MODULE_NETWORK | ||
483 | +#define QT_MODULE_OPENGL | ||
484 | Binary files qt-2.3.7/lib/libqte.dylib and qte-2.3.7/lib/libqte.dylib differ | ||
485 | Binary files qt-2.3.7/lib/libqte.dylib.2 and qte-2.3.7/lib/libqte.dylib.2 differ | ||
486 | Binary files qt-2.3.7/lib/libqte.dylib.2.3 and qte-2.3.7/lib/libqte.dylib.2.3 differ | ||
487 | Binary files qt-2.3.7/lib/libqte.dylib.2.3.7 and qte-2.3.7/lib/libqte.dylib.2.3.7 differ | ||
488 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp | ||
489 | --- qt-2.3.7/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003 | ||
490 | +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003 | ||
491 | @@ -35,6 +35,8 @@ | ||
492 | ** | ||
493 | **********************************************************************/ | ||
494 | |||
495 | +#define QT_WEAK_SYMBOL__attribute__(( weak )) | ||
496 | + | ||
497 | #include "qobjectlist.h" | ||
498 | #include "qobjectdict.h" | ||
499 | #include "qapplication.h" | ||
500 | @@ -933,11 +935,16 @@ | ||
501 | #ifndef QT_NO_STYLE | ||
502 | void QApplication::setStyle( QStyle *style ) | ||
503 | { | ||
504 | +setStyle_NonWeak ( style ); | ||
505 | +} | ||
506 | + | ||
507 | +void QApplication::setStyle_NonWeak( QStyle *style ) | ||
508 | +{ | ||
509 | QStyle* old = app_style; | ||
510 | - app_style = style; | ||
511 | |||
512 | if ( startingUp() ) { | ||
513 | delete old; | ||
514 | +app_style = style; | ||
515 | return; | ||
516 | } | ||
517 | |||
518 | @@ -958,6 +965,8 @@ | ||
519 | old->unPolish( qApp ); | ||
520 | } | ||
521 | |||
522 | + app_style = style; | ||
523 | + | ||
524 | // take care of possible palette requirements of certain gui | ||
525 | // styles. Do it before polishing the application since the style | ||
526 | // might call QApplication::setStyle() itself | ||
527 | @@ -1184,13 +1193,30 @@ | ||
528 | \sa QWidget::setPalette(), palette(), QStyle::polish() | ||
529 | */ | ||
530 | |||
531 | -void QApplication::setPalette( const QPalette &palette, bool informWidgets, | ||
532 | +void QApplication::setPalette ( const QPalette &palette, bool informWidgets, | ||
533 | + const char* className ) | ||
534 | +{ | ||
535 | +setPalette_NonWeak ( palette, informWidgets, className ); | ||
536 | +} | ||
537 | + | ||
538 | +void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets, | ||
539 | const char* className ) | ||
540 | { | ||
541 | QPalette pal = palette; | ||
542 | #ifndef QT_NO_STYLE | ||
543 | - if ( !startingUp() ) | ||
544 | + if ( !startingUp() ) { | ||
545 | qApp->style().polish( pal );// NB: non-const reference | ||
546 | +if ( className ) { | ||
547 | + // if we just polished a class specific palette (this normally | ||
548 | + // only called by qt_fix_tooltips - see below), we better re- | ||
549 | + // polish the global palette. Some styles like liquid can get | ||
550 | + // confused, because they can not detect if the polished palette | ||
551 | + // is the global one or only a class specific one. | ||
552 | + // (liquid uses this palette to calculate blending pixmaps) | ||
553 | + QPalette p = qApp-> palette ( ); | ||
554 | + qApp->style().polish ( p ); | ||
555 | +} | ||
556 | + } | ||
557 | #endif | ||
558 | bool all = FALSE; | ||
559 | if ( !className ) { | ||
560 | @@ -1273,6 +1299,12 @@ | ||
561 | */ | ||
562 | |||
563 | void QApplication::setFont( const QFont &font, bool informWidgets, | ||
564 | + const char* className ) | ||
565 | +{ | ||
566 | +setFont_NonWeak ( font, informWidgets, className ); | ||
567 | +} | ||
568 | + | ||
569 | +void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, | ||
570 | const char* className ) | ||
571 | { | ||
572 | bool all = FALSE; | ||
573 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h | ||
574 | --- qt-2.3.7/src/kernel/qapplication.hThu Jul 17 03:20:25 2003 | ||
575 | +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003 | ||
576 | @@ -61,6 +61,10 @@ | ||
577 | class QSemaphore; | ||
578 | #endif | ||
579 | |||
580 | +#if !defined( QT_WEAK_SYMBOL ) | ||
581 | +#define QT_WEAK_SYMBOL | ||
582 | +#endif | ||
583 | + | ||
584 | // REMOVE IN 3.0 (just here for moc source compatibility) | ||
585 | #define QNonBaseApplication QApplication | ||
586 | |||
587 | @@ -85,7 +89,10 @@ | ||
588 | |||
589 | #ifndef QT_NO_STYLE | ||
590 | static QStyle &style(); | ||
591 | - static void setStyle( QStyle* ); | ||
592 | + static void setStyle( QStyle* ) QT_WEAK_SYMBOL; | ||
593 | +private: | ||
594 | +static void setStyle_NonWeak( QStyle* ); | ||
595 | +public: | ||
596 | #endif | ||
597 | #if 1/* OBSOLETE */ | ||
598 | enum ColorMode { NormalColors, CustomColors }; | ||
599 | @@ -106,11 +113,19 @@ | ||
600 | #ifndef QT_NO_PALETTE | ||
601 | static QPalette palette( const QWidget* = 0 ); | ||
602 | static void setPalette( const QPalette &, bool informWidgets=FALSE, | ||
603 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
604 | +private: | ||
605 | + static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, | ||
606 | const char* className = 0 ); | ||
607 | +public: | ||
608 | #endif | ||
609 | static QFont font( const QWidget* = 0 ); | ||
610 | static void setFont( const QFont &, bool informWidgets=FALSE, | ||
611 | + const char* className = 0 ) QT_WEAK_SYMBOL; | ||
612 | +private: | ||
613 | + static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, | ||
614 | const char* className = 0 ); | ||
615 | +public: | ||
616 | static QFontMetrics fontMetrics(); | ||
617 | |||
618 | QWidget *mainWidget() const; | ||
619 | @@ -207,7 +222,10 @@ | ||
620 | void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); | ||
621 | #ifndef QT_NO_QWS_MANAGER | ||
622 | static QWSDecoration &qwsDecoration(); | ||
623 | - static void qwsSetDecoration( QWSDecoration *); | ||
624 | + static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; | ||
625 | +private: | ||
626 | + static void qwsSetDecoration_NonWeak( QWSDecoration *); | ||
627 | +public: | ||
628 | #endif | ||
629 | #endif | ||
630 | |||
631 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp | ||
632 | --- qt-2.3.7/src/kernel/qapplication_qws.cppThu Jul 17 03:20:25 2003 | ||
633 | +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003 | ||
634 | @@ -2804,6 +2804,11 @@ | ||
635 | */ | ||
636 | void QApplication::qwsSetDecoration( QWSDecoration *d ) | ||
637 | { | ||
638 | +qwsSetDecoration_NonWeak ( d ); | ||
639 | +} | ||
640 | + | ||
641 | +void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) | ||
642 | +{ | ||
643 | if ( d ) { | ||
644 | delete qws_decoration; | ||
645 | qws_decoration = d; | ||
646 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp | ||
647 | --- qt-2.3.7/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003 | ||
648 | +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003 | ||
649 | @@ -35,6 +35,8 @@ | ||
650 | ** | ||
651 | **********************************************************************/ | ||
652 | |||
653 | +#define QT_WEAK_SYMBOL __attribute__(( weak )) | ||
654 | + | ||
655 | #include "qfontdatabase.h" | ||
656 | |||
657 | #ifndef QT_NO_FONTDATABASE | ||
658 | @@ -2421,6 +2423,13 @@ | ||
659 | */ | ||
660 | |||
661 | QValueList<int> QFontDatabase::pointSizes( const QString &family, | ||
662 | + const QString &style, | ||
663 | + const QString &charSet ) | ||
664 | +{ | ||
665 | +return pointSizes_NonWeak ( family, style, charSet ); | ||
666 | +} | ||
667 | + | ||
668 | +QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, | ||
669 | const QString &style, | ||
670 | const QString &charSet ) | ||
671 | { | ||
672 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h | ||
673 | --- qt-2.3.7/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003 | ||
674 | +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003 | ||
675 | @@ -59,6 +59,10 @@ | ||
676 | class QDiskFont; | ||
677 | #endif | ||
678 | |||
679 | +#if !defined( QT_WEAK_SYMBOL ) | ||
680 | +#define QT_WEAK_SYMBOL | ||
681 | +#endif | ||
682 | + | ||
683 | class QFontDatabasePrivate; | ||
684 | |||
685 | class Q_EXPORT QFontDatabase | ||
686 | @@ -67,9 +71,16 @@ | ||
687 | QFontDatabase(); | ||
688 | |||
689 | QStringList families( bool onlyForLocale = TRUE ) const; | ||
690 | + | ||
691 | + | ||
692 | QValueList<int> pointSizes( const QString &family, | ||
693 | const QString &style = QString::null, | ||
694 | - const QString &charSet = QString::null ); | ||
695 | + const QString &charSet = QString::null ) QT_WEAK_SYMBOL; | ||
696 | +private: | ||
697 | + QValueList<int> pointSizes_NonWeak( const QString &family, | ||
698 | + const QString &style, | ||
699 | + const QString &charSet ); | ||
700 | +public: | ||
701 | QStringList styles( const QString &family, | ||
702 | const QString &charSet = QString::null ) const; | ||
703 | QStringList charSets( const QString &familyName, | ||
704 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp | ||
705 | --- qt-2.3.7/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003 | ||
706 | +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003 | ||
707 | @@ -32,7 +32,7 @@ | ||
708 | #include "qgfx_qws.h" | ||
709 | |||
710 | #include <stdio.h> | ||
711 | -#include <dlfcn.h> | ||
712 | +//#include <dlfcn.h> | ||
713 | #include <sys/types.h> | ||
714 | #include <dirent.h> | ||
715 | #include <stdlib.h> | ||
716 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp | ||
717 | --- qt-2.3.7/src/kernel/qgfxraster_qws.cppThu Jul 17 03:20:25 2003 | ||
718 | +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003 | ||
719 | @@ -75,7 +75,11 @@ | ||
720 | # if __BYTE_ORDER == __BIG_ENDIAN | ||
721 | # define QWS_BIG_ENDIAN | ||
722 | # endif | ||
723 | +#elif defined(__APPLE__) | ||
724 | +# define QWS_BIG_ENDIAN | ||
725 | #endif | ||
726 | +// AJ: the above (test for __APPLE__) is very hacky, but I can't | ||
727 | +// think of something better at the moment. | ||
728 | |||
729 | // Pull this private function in from qglobal.cpp | ||
730 | extern unsigned int qt_int_sqrt( unsigned int n ); | ||
731 | @@ -3770,6 +3774,19 @@ | ||
732 | b = srcval & 0xff; | ||
733 | |||
734 | unsigned char * tmp=(unsigned char *)&alphabuf[loopc]; | ||
735 | +# ifdef QWS_BIG_ENDIAN | ||
736 | + if(av==255) { | ||
737 | + // Do nothing - we already have source values in r,g,b | ||
738 | + } else if(av==0) { | ||
739 | + r = *(tmp+1); | ||
740 | + g = *(tmp+2); | ||
741 | + b = *(tmp+3); | ||
742 | + } else { | ||
743 | + r = ((r-*(tmp+1)) * av) / 256 + *(tmp+1); | ||
744 | + g = ((g-*(tmp+2)) * av) / 256 + *(tmp+2); | ||
745 | + b = ((b-*(tmp+3)) * av) / 256 + *(tmp+3); | ||
746 | + } | ||
747 | +# else | ||
748 | if(av==255) { | ||
749 | // Do nothing - we already have source values in r,g,b | ||
750 | } else if(av==0) { | ||
751 | @@ -3781,6 +3798,7 @@ | ||
752 | g = ((g-*(tmp+1)) * av) / 256 + *(tmp+1); | ||
753 | b = ((b-*(tmp+0)) * av) / 256 + *(tmp+0); | ||
754 | } | ||
755 | +# endif | ||
756 | *(alphaptr++) = (r << 16) | (g << 8) | b; | ||
757 | } | ||
758 | |||
759 | @@ -4204,7 +4222,7 @@ | ||
760 | |||
761 | } else if ( depth == 1 ) { | ||
762 | if (srctype==SourceImage) { | ||
763 | - static int warn; | ||
764 | + static int warn = 0; | ||
765 | if ( warn++ < 5 ) | ||
766 | qDebug( "bitmap alpha-image not implemented" ); | ||
767 | hImageLineUnclipped( x1, x2, l, srcdata, FALSE ); | ||
768 | @@ -4237,7 +4255,7 @@ | ||
769 | setAlphaType(IgnoreAlpha); | ||
770 | if ( w <= 0 || h <= 0 || !ncliprect ) return; | ||
771 | GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) | ||
772 | -#ifdef QWS_EXPERIMENTAL_FASTPATH | ||
773 | +#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! | ||
774 | // ### fix for 8bpp | ||
775 | // This seems to be reliable now, at least for 16bpp | ||
776 | |||
777 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp | ||
778 | --- qt-2.3.7/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003 | ||
779 | +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003 | ||
780 | @@ -69,7 +69,7 @@ | ||
781 | #if !defined(_OS_QNX6_) | ||
782 | |||
783 | #include <termios.h> | ||
784 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
785 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
786 | #include <sys/kd.h> | ||
787 | #include <sys/vt.h> | ||
788 | #endif | ||
789 | @@ -468,10 +468,12 @@ | ||
790 | void QWSPC101KeyboardHandler::restoreLeds() | ||
791 | { | ||
792 | char leds; | ||
793 | +#if !defined(_OS_MACX_) | ||
794 | ioctl(0, KDGETLED, &leds); | ||
795 | leds = leds & ~LED_CAP; | ||
796 | if ( caps ) leds |= LED_CAP; | ||
797 | ioctl(0, KDSETLED, leds); | ||
798 | +#endif | ||
799 | } | ||
800 | |||
801 | class QWSTtyKeyboardHandler : public QWSPC101KeyboardHandler | ||
802 | @@ -547,7 +549,7 @@ | ||
803 | |||
804 | static void vtSwitchHandler(int /*sig*/) | ||
805 | { | ||
806 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
807 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
808 | if (vtActive) { | ||
809 | qwsServer->enablePainting(false); | ||
810 | qt_screen->save(); | ||
811 | @@ -880,7 +882,7 @@ | ||
812 | if (term && !release) { | ||
813 | ctrl = false; | ||
814 | alt = false; | ||
815 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
816 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
817 | ioctl(kbdFD, VT_ACTIVATE, term); | ||
818 | #endif | ||
819 | return; | ||
820 | @@ -1031,7 +1033,7 @@ | ||
821 | struct termios termdata; | ||
822 | tcgetattr( kbdFD, &termdata ); | ||
823 | |||
824 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
825 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
826 | ioctl(kbdFD, KDSKBMODE, K_RAW); | ||
827 | #endif | ||
828 | |||
829 | @@ -1047,7 +1049,7 @@ | ||
830 | |||
831 | signal(VTSWITCHSIG, vtSwitchHandler); | ||
832 | |||
833 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
834 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
835 | struct vt_mode vtMode; | ||
836 | ioctl(kbdFD, VT_GETMODE, &vtMode); | ||
837 | |||
838 | @@ -1068,7 +1070,7 @@ | ||
839 | { | ||
840 | if (kbdFD >= 0) | ||
841 | { | ||
842 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
843 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
844 | ioctl(kbdFD, KDSKBMODE, K_XLATE); | ||
845 | #endif | ||
846 | tcsetattr(kbdFD, TCSANOW, &origTermData); | ||
847 | diff -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 | + | ||
885 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp | ||
886 | --- qt-2.3.7/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003 | ||
887 | +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003 | ||
888 | @@ -38,7 +38,7 @@ | ||
889 | #include <errno.h> | ||
890 | |||
891 | #if defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) \ | ||
892 | - || defined _OS_FREEBSD_ | ||
893 | + || defined(_OS_FREEBSD_) || defined(_OS_MACX_) | ||
894 | /* union semun is defined by including <sys/sem.h> */ | ||
895 | #else | ||
896 | /* according to X/OPEN we have to define it ourselves */ | ||
897 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp | ||
898 | --- qt-2.3.7/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003 | ||
899 | +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003 | ||
900 | @@ -844,6 +844,18 @@ | ||
901 | { | ||
902 | } | ||
903 | |||
904 | +static void catchSegvSignal( int ) | ||
905 | +{ | ||
906 | +#ifndef QT_NO_QWS_KEYBOARD | ||
907 | + if ( qwsServer ) | ||
908 | +qwsServer->closeKeyboard(); | ||
909 | +#endif | ||
910 | + QWSServer::closedown(); | ||
911 | + fprintf(stderr, "Segmentation fault.\n"); | ||
912 | + exit(1); | ||
913 | +} | ||
914 | + | ||
915 | + | ||
916 | /*! | ||
917 | \class QWSServer qwindowsystem_qws.h | ||
918 | \brief Server-specific functionality in Qt/Embedded | ||
919 | @@ -936,6 +948,7 @@ | ||
920 | } | ||
921 | |||
922 | signal(SIGPIPE, ignoreSignal); //we get it when we read | ||
923 | + signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash | ||
924 | #endif | ||
925 | focusw = 0; | ||
926 | mouseGrabber = 0; | ||
927 | @@ -950,7 +963,7 @@ | ||
928 | |||
929 | #ifndef QT_NO_QWS_MULTIPROCESS | ||
930 | if ( !geteuid() ) { | ||
931 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
932 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
933 | if( mount(0, "/var/shm", "shm", 0, 0) ) { | ||
934 | /* This just confuses people with 2.2 kernels | ||
935 | if ( errno != EBUSY ) | ||
936 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp | ||
937 | --- qt-2.3.7/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003 | ||
938 | +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003 | ||
939 | @@ -336,7 +336,7 @@ | ||
940 | tty.c_oflag = 0; | ||
941 | tty.c_lflag = 0; | ||
942 | tty.c_cflag = f | CREAD | CLOCAL | HUPCL; | ||
943 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
944 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
945 | tty.c_line = 0; | ||
946 | #endif | ||
947 | tty.c_cc[VTIME] = 0; | ||
948 | @@ -889,7 +889,7 @@ | ||
949 | tty.c_iflag = IGNBRK | IGNPAR; | ||
950 | tty.c_oflag = 0; | ||
951 | tty.c_lflag = 0; | ||
952 | -#if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
953 | +#if !defined(_OS_MACX_) && !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) | ||
954 | tty.c_line = 0; | ||
955 | #endif // _OS_FREEBSD_ | ||
956 | tty.c_cc[VTIME] = 0; | ||
957 | Binary files qt-2.3.7/src/moc/moc and qte-2.3.7/src/moc/moc differ | ||
958 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp | ||
959 | --- qt-2.3.7/src/network/qdns.cppThu Jul 17 03:20:26 2003 | ||
960 | +++ qte-2.3.7/src/network/qdns.cppSun Nov 16 13:44:27 2003 | ||
961 | @@ -1991,7 +1991,7 @@ | ||
962 | domains = new QStrList( TRUE ); | ||
963 | domains->setAutoDelete( TRUE ); | ||
964 | |||
965 | - res_init(); | ||
966 | + // res_init(); (eilers: Caused link problems) | ||
967 | int i; | ||
968 | // find the name servers to use | ||
969 | for( i=0; i < MAXNS && i < _res.nscount; i++ ) { | ||
970 | diff -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 | ||
1074 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h | ||
1075 | --- qt-2.3.7/src/tools/qconfig.hFri Jan 26 14:43:06 2001 | ||
1076 | +++ qte-2.3.7/src/tools/qconfig.hThu Dec 11 12:54:20 2003 | ||
1077 | @@ -1,3 +1,26 @@ | ||
1078 | +// Copied from qconfig-qpe.h | ||
1079 | +/********************************************************************** | ||
1080 | +** Copyright (C) 2000 Trolltech AS. All rights reserved. | ||
1081 | +** | ||
1082 | +** This file is part of Qtopia Environment. | ||
1083 | +** | ||
1084 | +** This file may be distributed and/or modified under the terms of the | ||
1085 | +** GNU General Public License version 2 as published by the Free Software | ||
1086 | +** Foundation and appearing in the file LICENSE.GPL included in the | ||
1087 | +** packaging of this file. | ||
1088 | +** | ||
1089 | +** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | ||
1090 | +** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | ||
1091 | +** | ||
1092 | +** See http://www.trolltech.com/gpl/ for GPL licensing information. | ||
1093 | +** | ||
1094 | +** Contact info@trolltech.com if any conditions of this licensing are | ||
1095 | +** not clear to you. | ||
1096 | +** | ||
1097 | +**********************************************************************/ | ||
1098 | +#ifndef QT_H | ||
1099 | +#endif // QT_H | ||
1100 | + | ||
1101 | // Empty leaves all features enabled. See doc/html/features.html for choices. | ||
1102 | |||
1103 | // Note that disabling some features will produce a libqt that is not | ||
1104 | @@ -8,3 +31,71 @@ | ||
1105 | #ifndef QT_DLL | ||
1106 | #define QT_DLL // Internal | ||
1107 | #endif | ||
1108 | + | ||
1109 | +#if defined(QT_QWS_IPAQ) || defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_SL5XXX) | ||
1110 | +# define QT_NO_QWS_CURSOR | ||
1111 | +# define QT_NO_QWS_MOUSE_AUTO | ||
1112 | +#endif | ||
1113 | +#ifndef QT_NO_CODECS | ||
1114 | +#define QT_NO_CODECS | ||
1115 | +#endif | ||
1116 | +#define QT_NO_UNICODETABLES | ||
1117 | +//#define QT_NO_IMAGEIO_BMP | ||
1118 | +#define QT_NO_IMAGEIO_PPM | ||
1119 | +//#define QT_NO_ASYNC_IO | ||
1120 | +//#define QT_NO_ASYNC_IMAGE_IO | ||
1121 | +#define QT_NO_FREETYPE | ||
1122 | +#define QT_NO_BDF | ||
1123 | +//#define QT_NO_FONTDATABASE | ||
1124 | +#define QT_NO_DRAGANDDROP | ||
1125 | +//#define QT_NO_CLIPBOARD | ||
1126 | +#define QT_NO_PROPERTIES | ||
1127 | +#define QT_NO_NETWORKPROTOCOL | ||
1128 | + | ||
1129 | +#define QT_NO_IMAGE_TEXT | ||
1130 | + | ||
1131 | +//#define QT_NO_TOOLTIP | ||
1132 | +#define QT_NO_COLORNAMES | ||
1133 | +#define QT_NO_TRANSFORMATIONS | ||
1134 | +#define QT_NO_TRANSLATION_BUILDER | ||
1135 | +#define QT_NO_COMPLEXTEXT | ||
1136 | +#define QT_NO_PRINTER | ||
1137 | +#define QT_NO_PICTURE | ||
1138 | +//#define QT_NO_ICONVIEW | ||
1139 | +#define QT_NO_DIAL | ||
1140 | +#define QT_NO_SIZEGRIP | ||
1141 | +#define QT_NO_WORKSPACE | ||
1142 | +//#define QT_NO_TABLE | ||
1143 | +//#define QT_NO_ACTION | ||
1144 | +//#define QT_NO_SETTINGS | ||
1145 | +#define QT_NO_STYLE_POCKETPC | ||
1146 | +#ifndef QT_NO_STYLE_AQUA | ||
1147 | +# define QT_NO_STYLE_AQUA | ||
1148 | +#endif | ||
1149 | +#define QT_NO_STYLE_MOTIF | ||
1150 | +#define QT_NO_STYLE_PLATINUM | ||
1151 | +#define QT_NO_FILEDIALOG | ||
1152 | +#define QT_NO_FONTDIALOG | ||
1153 | +#define QT_NO_PRINTDIALOG | ||
1154 | +#define QT_NO_COLORDIALOG | ||
1155 | +#define QT_NO_INPUTDIALOG | ||
1156 | +//#define QT_NO_MESSAGEBOX | ||
1157 | +#define QT_NO_PROGRESSDIALOG | ||
1158 | +//#define QT_NO_TABDIALOG | ||
1159 | +#define QT_NO_WIZARD | ||
1160 | +#define QT_NO_EFFECTS | ||
1161 | +//#define QT_NO_COMPONENT | ||
1162 | +#define QT_NO_DOM | ||
1163 | +#define QT_NO_SEMIMODAL | ||
1164 | +//#define QT_NO_PROGRESSBAR | ||
1165 | +#define QT_NO_SPLITTER | ||
1166 | + | ||
1167 | +//#define QT_NO_QWS_SAVEFONTS | ||
1168 | +//#define QT_NO_QWS_PROPERTIES | ||
1169 | + | ||
1170 | +#define QT_NO_QWS_BEOS_WM_STYLE | ||
1171 | +#define QT_NO_QWS_KDE2_WM_STYLE | ||
1172 | +#define QT_NO_QWS_KDE_WM_STYLE | ||
1173 | +#define QT_NO_QWS_WINDOWS_WM_STYLE | ||
1174 | + | ||
1175 | +#define QT_NO_SOUND | ||
1176 | \ No newline at end of file | ||
1177 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h | ||
1178 | --- qt-2.3.7/src/tools/qmodules.hFri Aug 31 17:00:56 2001 | ||
1179 | +++ qte-2.3.7/src/tools/qmodules.hThu Dec 11 12:53:57 2003 | ||
1180 | @@ -1,14 +1,12 @@ | ||
1181 | -#ifndef QT_H | ||
1182 | -#endif // QT_H | ||
1183 | - | ||
1184 | +// These modules are licensed to you | ||
1185 | #define QT_MODULE_TOOLS | ||
1186 | #define QT_MODULE_KERNEL | ||
1187 | #define QT_MODULE_WIDGETS | ||
1188 | #define QT_MODULE_DIALOGS | ||
1189 | - | ||
1190 | #define QT_MODULE_ICONVIEW | ||
1191 | #define QT_MODULE_WORKSPACE | ||
1192 | -#define QT_MODULE_TABLE | ||
1193 | +#define QT_MODULE_NETWORK | ||
1194 | #define QT_MODULE_CANVAS | ||
1195 | +#define QT_MODULE_TABLE | ||
1196 | #define QT_MODULE_XML | ||
1197 | -#define QT_MODULE_NETWORK | ||
1198 | +#define QT_MODULE_OPENGL | ||
1199 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp | ||
1200 | --- qt-2.3.7/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003 | ||
1201 | +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003 | ||
1202 | @@ -566,7 +566,7 @@ | ||
1203 | bool enabled, bool active ) | ||
1204 | { | ||
1205 | #ifndef QT_NO_MENUBAR | ||
1206 | -#ifndef QT_NO_STYLE_SGI | ||
1207 | +#if 1 // #ifndef QT_NO_STYLE_SGI | ||
1208 | if (draw_menu_bar_impl != 0) { | ||
1209 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | ||
1210 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | ||
1211 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp | ||
1212 | --- qt-2.3.7/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003 | ||
1213 | +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003 | ||
1214 | @@ -4968,9 +4968,9 @@ | ||
1215 | l = l->childItem ? l->childItem : l->siblingItem; | ||
1216 | |||
1217 | if ( l && l->height() ) | ||
1218 | -s.setHeight( s.height() + 10 * l->height() ); | ||
1219 | - else | ||
1220 | -s.setHeight( s.height() + 140 ); | ||
1221 | +s.setHeight( s.height() + 4 /*10*/ * l->height() ); | ||
1222 | + else // ^v much too big for handhelds | ||
1223 | +s.setHeight( s.height() + 30 /*140*/ ); | ||
1224 | |||
1225 | if ( s.width() > s.height() * 3 ) | ||
1226 | s.setHeight( s.width() / 3 ); | ||
1227 | diff -uNr --exclude-from=./diff_ignore qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp | ||
1228 | --- qt-2.3.7/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003 | ||
1229 | +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003 | ||
1230 | @@ -230,7 +230,7 @@ | ||
1231 | else | ||
1232 | QToolTip::add( this, textLabel ); | ||
1233 | } | ||
1234 | -#endif | ||
1235 | +#endif | ||
1236 | } | ||
1237 | |||
1238 | |||
1239 | @@ -324,12 +324,12 @@ | ||
1240 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); | ||
1241 | w = pm.width(); | ||
1242 | h = pm.height(); | ||
1243 | -if ( w < 32 ) | ||
1244 | - w = 32; | ||
1245 | -if ( h < 32 ) | ||
1246 | - h = 32; | ||
1247 | +if ( w < 24 ) | ||
1248 | + w = 24; | ||
1249 | +if ( h < 24 ) | ||
1250 | + h = 24; | ||
1251 | } else { | ||
1252 | -w = h = 16; | ||
1253 | +w = h = 14; | ||
1254 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | ||
1255 | w = pm.width(); | ||
1256 | h = pm.height(); | ||
1257 | diff -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)" | ||