author | eilers <eilers> | 2003-12-15 09:42:43 (UTC) |
---|---|---|
committer | eilers <eilers> | 2003-12-15 09:42:43 (UTC) |
commit | 3159e108d49cb08b4891c8d3a33209f45e0e58f6 (patch) (unidiff) | |
tree | fa72958ea2221d6d8a246aef3ebad5852dbb0439 /qt/qt-2.3.7.patch | |
parent | 07590207a8306d0184e3c331a71f41a58ccbc96f (diff) | |
download | opie-3159e108d49cb08b4891c8d3a33209f45e0e58f6.zip opie-3159e108d49cb08b4891c8d3a33209f45e0e58f6.tar.gz opie-3159e108d49cb08b4891c8d3a33209f45e0e58f6.tar.bz2 |
Patch includes new files not just changes
-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all-macosx.patch | 471 |
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,4 +1,108 @@ | |||
1 | diff -ru qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h | 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 | ||
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 @@ |
@@ -56,9 +160,113 @@ diff -ru qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h | |||
56 | #endif | 160 | #endif |
57 | #endif | 161 | #endif |
58 | 162 | ||
59 | diff -ru qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h | 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 | ||
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 | +/********************************************************************** |
@@ -159,7 +367,7 @@ diff -ru qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h | |||
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 |
162 | diff -ru qt-2.3.7/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h | 370 | diff -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 @@ |
@@ -191,9 +399,69 @@ diff -ru qt-2.3.7/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h | |||
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, |
194 | diff -ru qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h | 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 | ||
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 |
@@ -213,7 +481,11 @@ diff -ru qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h | |||
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 |
216 | diff -ru qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp | 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 | ||
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 @@ |
@@ -298,7 +570,7 @@ diff -ru qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication. | |||
298 | const char* className ) | 570 | const char* className ) |
299 | { | 571 | { |
300 | bool all = FALSE; | 572 | bool all = FALSE; |
301 | diff -ru qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h | 573 | diff -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 @@ |
@@ -356,7 +628,7 @@ diff -ru qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h | |||
356 | #endif | 628 | #endif |
357 | #endif | 629 | #endif |
358 | 630 | ||
359 | diff -ru qt-2.3.7/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp | 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 |
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 @@ |
@@ -371,7 +643,7 @@ diff -ru qt-2.3.7/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplicat | |||
371 | if ( d ) { | 643 | if ( d ) { |
372 | delete qws_decoration; | 644 | delete qws_decoration; |
373 | qws_decoration = d; | 645 | qws_decoration = d; |
374 | diff -ru qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp | 646 | diff -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 @@ |
@@ -397,7 +669,7 @@ diff -ru qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabas | |||
397 | const QString &style, | 669 | const QString &style, |
398 | const QString &charSet ) | 670 | const QString &charSet ) |
399 | { | 671 | { |
400 | diff -ru qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h | 672 | diff -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 @@ |
@@ -429,7 +701,7 @@ diff -ru qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase. | |||
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, |
432 | diff -ru qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp | 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 |
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 @@ |
@@ -441,7 +713,7 @@ diff -ru qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp | |||
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> |
444 | diff -ru qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp | 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 |
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 @@ |
@@ -502,7 +774,7 @@ diff -ru qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_ | |||
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 | ||
505 | diff -ru qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp | 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 |
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 @@ |
@@ -572,7 +844,45 @@ diff -ru qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qw | |||
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); |
575 | diff -ru qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp | 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 | ||
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 @@ |
@@ -584,7 +894,7 @@ diff -ru qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp | |||
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 */ |
587 | diff -ru qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp | 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 |
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 @@ |
@@ -623,7 +933,7 @@ diff -ru qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindows | |||
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 ) |
626 | diff -ru qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp | 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 |
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 @@ |
@@ -644,7 +954,8 @@ diff -ru qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws. | |||
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; |
647 | diff -ru qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp | 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 | ||
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 @@ |
@@ -656,9 +967,113 @@ diff -ru qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp | |||
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++ ) { |
659 | diff -ru qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h | 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 | ||
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 | +/********************************************************************** |
@@ -759,9 +1174,9 @@ diff -ru qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h | |||
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 |
762 | diff -ru qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h | 1177 | diff -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 |
@@ -781,7 +1196,7 @@ diff -ru qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h | |||
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 |
784 | diff -ru qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp | 1199 | diff -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 @@ |
@@ -793,7 +1208,7 @@ diff -ru qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyl | |||
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); |
796 | diff -ru qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp | 1211 | diff -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 @@ |
@@ -809,7 +1224,7 @@ diff -ru qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp | |||
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 ); |
812 | diff -ru qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp | 1227 | diff -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 @@ |
@@ -839,3 +1254,9 @@ diff -ru qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton. | |||
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(); |
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)" | ||