-rw-r--r-- | qt/qt-2.3.7.patch/qte237-all-macosx.patch | 448 |
1 files changed, 64 insertions, 384 deletions
diff --git a/qt/qt-2.3.7.patch/qte237-all-macosx.patch b/qt/qt-2.3.7.patch/qte237-all-macosx.patch index 82ed530..d1b3fdc 100644 --- a/qt/qt-2.3.7.patch/qte237-all-macosx.patch +++ b/qt/qt-2.3.7.patch/qte237-all-macosx.patch | |||
@@ -1,5 +1,5 @@ | |||
1 | diff -ru qte-2.3.7_orig/include/qapplication.h qte-2.3.7/include/qapplication.h | 1 | diff -ru qt-2.3.7/include/qapplication.h qte-2.3.7/include/qapplication.h |
2 | --- qte-2.3.7_orig/include/qapplication.hThu Jul 17 03:20:25 2003 | 2 | --- qt-2.3.7/include/qapplication.hThu Jul 17 03:20:25 2003 |
3 | +++ qte-2.3.7/include/qapplication.hMon Oct 27 14:21:28 2003 | 3 | +++ qte-2.3.7/include/qapplication.hMon Oct 27 14:21:28 2003 |
4 | @@ -61,6 +61,10 @@ | 4 | @@ -61,6 +61,10 @@ |
5 | class QSemaphore; | 5 | class QSemaphore; |
@@ -56,10 +56,9 @@ diff -ru qte-2.3.7_orig/include/qapplication.h qte-2.3.7/include/qapplication.h | |||
56 | #endif | 56 | #endif |
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | Only in qte-2.3.7/include: qconfig-qpe.h | 59 | diff -ru qt-2.3.7/include/qconfig.h qte-2.3.7/include/qconfig.h |
60 | diff -ru qte-2.3.7_orig/include/qconfig.h qte-2.3.7/include/qconfig.h | 60 | --- qt-2.3.7/include/qconfig.hFri Jan 26 14:43:06 2001 |
61 | --- qte-2.3.7_orig/include/qconfig.hFri Jan 26 14:43:06 2001 | 61 | +++ qte-2.3.7/include/qconfig.hSun Nov 16 13:35:10 2003 |
62 | +++ qte-2.3.7/include/qconfig.hWed Oct 29 22:13:16 2003 | ||
63 | @@ -1,3 +1,26 @@ | 62 | @@ -1,3 +1,26 @@ |
64 | +// Copied from qconfig-qpe.h | 63 | +// Copied from qconfig-qpe.h |
65 | +/********************************************************************** | 64 | +/********************************************************************** |
@@ -87,7 +86,7 @@ diff -ru qte-2.3.7_orig/include/qconfig.h qte-2.3.7/include/qconfig.h | |||
87 | // Empty leaves all features enabled. See doc/html/features.html for choices. | 86 | // Empty leaves all features enabled. See doc/html/features.html for choices. |
88 | 87 | ||
89 | // Note that disabling some features will produce a libqt that is not | 88 | // Note that disabling some features will produce a libqt that is not |
90 | @@ -8,3 +31,69 @@ | 89 | @@ -8,3 +31,71 @@ |
91 | #ifndef QT_DLL | 90 | #ifndef QT_DLL |
92 | #define QT_DLL // Internal | 91 | #define QT_DLL // Internal |
93 | #endif | 92 | #endif |
@@ -157,8 +156,11 @@ diff -ru qte-2.3.7_orig/include/qconfig.h qte-2.3.7/include/qconfig.h | |||
157 | +#define QT_NO_QWS_KDE2_WM_STYLE | 156 | +#define QT_NO_QWS_KDE2_WM_STYLE |
158 | +#define QT_NO_QWS_KDE_WM_STYLE | 157 | +#define QT_NO_QWS_KDE_WM_STYLE |
159 | +#define QT_NO_QWS_WINDOWS_WM_STYLE | 158 | +#define QT_NO_QWS_WINDOWS_WM_STYLE |
160 | diff -ru qte-2.3.7_orig/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h | 159 | + |
161 | --- qte-2.3.7_orig/include/qfontdatabase.hThu Jul 17 03:20:25 2003 | 160 | +#define QT_NO_SOUND |
161 | \ No newline at end of file | ||
162 | diff -ru qt-2.3.7/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase.h | ||
163 | --- qt-2.3.7/include/qfontdatabase.hThu Jul 17 03:20:25 2003 | ||
162 | +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003 | 164 | +++ qte-2.3.7/include/qfontdatabase.hMon Oct 27 14:21:28 2003 |
163 | @@ -59,6 +59,10 @@ | 165 | @@ -59,6 +59,10 @@ |
164 | class QDiskFont; | 166 | class QDiskFont; |
@@ -189,10 +191,9 @@ diff -ru qte-2.3.7_orig/include/qfontdatabase.h qte-2.3.7/include/qfontdatabase. | |||
189 | QStringList styles( const QString &family, | 191 | QStringList styles( const QString &family, |
190 | const QString &charSet = QString::null ) const; | 192 | const QString &charSet = QString::null ) const; |
191 | QStringList charSets( const QString &familyName, | 193 | QStringList charSets( const QString &familyName, |
192 | Only in qte-2.3.7_orig/include: qgifimageformat_p.h | 194 | diff -ru qt-2.3.7/include/qmodules.h qte-2.3.7/include/qmodules.h |
193 | diff -ru qte-2.3.7_orig/include/qmodules.h qte-2.3.7/include/qmodules.h | 195 | --- qt-2.3.7/include/qmodules.hFri Aug 31 17:00:56 2001 |
194 | --- qte-2.3.7_orig/include/qmodules.hFri Aug 31 17:00:56 2001 | 196 | +++ qte-2.3.7/include/qmodules.hSun Nov 16 13:34:58 2003 |
195 | +++ qte-2.3.7/include/qmodules.hWed Oct 29 21:57:53 2003 | ||
196 | @@ -1,14 +1,12 @@ | 197 | @@ -1,14 +1,12 @@ |
197 | -#ifndef QT_H | 198 | -#ifndef QT_H |
198 | -#endif // QT_H | 199 | -#endif // QT_H |
@@ -212,74 +213,8 @@ diff -ru qte-2.3.7_orig/include/qmodules.h qte-2.3.7/include/qmodules.h | |||
212 | #define QT_MODULE_XML | 213 | #define QT_MODULE_XML |
213 | -#define QT_MODULE_NETWORK | 214 | -#define QT_MODULE_NETWORK |
214 | +#define QT_MODULE_OPENGL | 215 | +#define QT_MODULE_OPENGL |
215 | Only in qte-2.3.7_orig/include: qxt.h | 216 | diff -ru qt-2.3.7/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp |
216 | Only in qte-2.3.7/lib: libqte.dylib | 217 | --- qt-2.3.7/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003 |
217 | Only in qte-2.3.7/lib: libqte.dylib.2 | ||
218 | Only in qte-2.3.7/lib: libqte.dylib.2.3 | ||
219 | Only in qte-2.3.7/lib: libqte.dylib.2.3.7 | ||
220 | Only in qte-2.3.7/src/3rdparty/kernel: qgifimageformat.o | ||
221 | Only in qte-2.3.7/src/3rdparty/kernel: qpointarray.o | ||
222 | Only in qte-2.3.7/src/3rdparty/kernel: qpolygonscanner.o | ||
223 | Only in qte-2.3.7/src/3rdparty/kernel: qregion_qws.o | ||
224 | Only in qte-2.3.7/src/3rdparty/libpng: png.o | ||
225 | Only in qte-2.3.7/src/3rdparty/libpng: pngerror.o | ||
226 | Only in qte-2.3.7/src/3rdparty/libpng: pngget.o | ||
227 | Only in qte-2.3.7/src/3rdparty/libpng: pngmem.o | ||
228 | Only in qte-2.3.7/src/3rdparty/libpng: pngpread.o | ||
229 | Only in qte-2.3.7/src/3rdparty/libpng: pngread.o | ||
230 | Only in qte-2.3.7/src/3rdparty/libpng: pngrio.o | ||
231 | Only in qte-2.3.7/src/3rdparty/libpng: pngrtran.o | ||
232 | Only in qte-2.3.7/src/3rdparty/libpng: pngrutil.o | ||
233 | Only in qte-2.3.7/src/3rdparty/libpng: pngset.o | ||
234 | Only in qte-2.3.7/src/3rdparty/libpng: pngtrans.o | ||
235 | Only in qte-2.3.7/src/3rdparty/libpng: pngwio.o | ||
236 | Only in qte-2.3.7/src/3rdparty/libpng: pngwrite.o | ||
237 | Only in qte-2.3.7/src/3rdparty/libpng: pngwtran.o | ||
238 | Only in qte-2.3.7/src/3rdparty/libpng: pngwutil.o | ||
239 | Only in qte-2.3.7/src/3rdparty/tools: qbig5codec.o | ||
240 | Only in qte-2.3.7/src/3rdparty/tools: qeucjpcodec.o | ||
241 | Only in qte-2.3.7/src/3rdparty/tools: qeuckrcodec.o | ||
242 | Only in qte-2.3.7/src/3rdparty/tools: qgbkcodec.o | ||
243 | Only in qte-2.3.7/src/3rdparty/tools: qjiscodec.o | ||
244 | Only in qte-2.3.7/src/3rdparty/tools: qjpunicode.o | ||
245 | Only in qte-2.3.7/src/3rdparty/tools: qrtlcodec.o | ||
246 | Only in qte-2.3.7/src/3rdparty/tools: qsjiscodec.o | ||
247 | Only in qte-2.3.7/src/3rdparty/tools: qtsciicodec.o | ||
248 | Only in qte-2.3.7/src/3rdparty/zlib: Makefile | ||
249 | Only in qte-2.3.7/src/3rdparty/zlib: adler32.o | ||
250 | Only in qte-2.3.7/src/3rdparty/zlib: compress.o | ||
251 | Only in qte-2.3.7/src/3rdparty/zlib: crc32.o | ||
252 | Only in qte-2.3.7/src/3rdparty/zlib: deflate.o | ||
253 | Only in qte-2.3.7/src/3rdparty/zlib: gzio.o | ||
254 | Only in qte-2.3.7/src/3rdparty/zlib: infblock.o | ||
255 | Only in qte-2.3.7/src/3rdparty/zlib: infcodes.o | ||
256 | Only in qte-2.3.7/src/3rdparty/zlib: inffast.o | ||
257 | Only in qte-2.3.7/src/3rdparty/zlib: inflate.o | ||
258 | Only in qte-2.3.7/src/3rdparty/zlib: inftrees.o | ||
259 | Only in qte-2.3.7/src/3rdparty/zlib: infutil.o | ||
260 | Only in qte-2.3.7/src/3rdparty/zlib: trees.o | ||
261 | Only in qte-2.3.7/src/3rdparty/zlib: uncompr.o | ||
262 | Only in qte-2.3.7/src/3rdparty/zlib: zutil.o | ||
263 | Only in qte-2.3.7/src: Makefile | ||
264 | Only in qte-2.3.7/src: allmoc.cpp | ||
265 | Only in qte-2.3.7/src: allmoc.o | ||
266 | Only in qte-2.3.7/src/canvas: qcanvas.o | ||
267 | Only in qte-2.3.7/src/dialogs: qcolordialog.moc | ||
268 | Only in qte-2.3.7/src/dialogs: qcolordialog.o | ||
269 | Only in qte-2.3.7/src/dialogs: qfiledialog.moc | ||
270 | Only in qte-2.3.7/src/dialogs: qfiledialog.o | ||
271 | Only in qte-2.3.7/src/dialogs: qfontdialog.o | ||
272 | Only in qte-2.3.7/src/dialogs: qinputdialog.o | ||
273 | Only in qte-2.3.7/src/dialogs: qmessagebox.o | ||
274 | Only in qte-2.3.7/src/dialogs: qprintdialog.o | ||
275 | Only in qte-2.3.7/src/dialogs: qprogressdialog.o | ||
276 | Only in qte-2.3.7/src/dialogs: qtabdialog.o | ||
277 | Only in qte-2.3.7/src/dialogs: qwizard.o | ||
278 | Only in qte-2.3.7/src/iconview: qiconview.o | ||
279 | Only in qte-2.3.7/src/kernel: qabstractlayout.o | ||
280 | Only in qte-2.3.7/src/kernel: qaccel.o | ||
281 | diff -ru qte-2.3.7_orig/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplication.cpp | ||
282 | --- qte-2.3.7_orig/src/kernel/qapplication.cppThu Jul 17 03:20:25 2003 | ||
283 | +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003 | 218 | +++ qte-2.3.7/src/kernel/qapplication.cppMon Oct 27 14:21:28 2003 |
284 | @@ -35,6 +35,8 @@ | 219 | @@ -35,6 +35,8 @@ |
285 | ** | 220 | ** |
@@ -363,8 +298,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qapplication.cpp qte-2.3.7/src/kernel/qapplic | |||
363 | const char* className ) | 298 | const char* className ) |
364 | { | 299 | { |
365 | bool all = FALSE; | 300 | bool all = FALSE; |
366 | diff -ru qte-2.3.7_orig/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h | 301 | diff -ru qt-2.3.7/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplication.h |
367 | --- qte-2.3.7_orig/src/kernel/qapplication.hThu Jul 17 03:20:25 2003 | 302 | --- qt-2.3.7/src/kernel/qapplication.hThu Jul 17 03:20:25 2003 |
368 | +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003 | 303 | +++ qte-2.3.7/src/kernel/qapplication.hMon Oct 27 14:21:28 2003 |
369 | @@ -61,6 +61,10 @@ | 304 | @@ -61,6 +61,10 @@ |
370 | class QSemaphore; | 305 | class QSemaphore; |
@@ -421,9 +356,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qapplication.h qte-2.3.7/src/kernel/qapplicat | |||
421 | #endif | 356 | #endif |
422 | #endif | 357 | #endif |
423 | 358 | ||
424 | Only in qte-2.3.7/src/kernel: qapplication.o | 359 | diff -ru qt-2.3.7/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp |
425 | diff -ru qte-2.3.7_orig/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qapplication_qws.cpp | 360 | --- qt-2.3.7/src/kernel/qapplication_qws.cppThu Jul 17 03:20:25 2003 |
426 | --- qte-2.3.7_orig/src/kernel/qapplication_qws.cppThu Jul 17 03:20:25 2003 | ||
427 | +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003 | 361 | +++ qte-2.3.7/src/kernel/qapplication_qws.cppMon Oct 27 14:21:28 2003 |
428 | @@ -2804,6 +2804,11 @@ | 362 | @@ -2804,6 +2804,11 @@ |
429 | */ | 363 | */ |
@@ -437,33 +371,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qapplication_qws.cpp qte-2.3.7/src/kernel/qap | |||
437 | if ( d ) { | 371 | if ( d ) { |
438 | delete qws_decoration; | 372 | delete qws_decoration; |
439 | qws_decoration = d; | 373 | qws_decoration = d; |
440 | Only in qte-2.3.7/src/kernel: qapplication_qws.cpp~ | 374 | diff -ru qt-2.3.7/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp |
441 | Only in qte-2.3.7/src/kernel: qapplication_qws.o | 375 | --- qt-2.3.7/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003 |
442 | Only in qte-2.3.7/src/kernel: qasyncimageio.o | ||
443 | Only in qte-2.3.7/src/kernel: qasyncio.o | ||
444 | Only in qte-2.3.7/src/kernel: qbitmap.o | ||
445 | Only in qte-2.3.7/src/kernel: qclipboard.o | ||
446 | Only in qte-2.3.7/src/kernel: qclipboard_qws.o | ||
447 | Only in qte-2.3.7/src/kernel: qcolor.o | ||
448 | Only in qte-2.3.7/src/kernel: qcolor_p.o | ||
449 | Only in qte-2.3.7/src/kernel: qcolor_qws.o | ||
450 | Only in qte-2.3.7/src/kernel: qconnection.o | ||
451 | Only in qte-2.3.7/src/kernel: qcopchannel_qws.moc | ||
452 | Only in qte-2.3.7/src/kernel: qcopchannel_qws.o | ||
453 | Only in qte-2.3.7/src/kernel: qcursor.o | ||
454 | Only in qte-2.3.7/src/kernel: qcursor_qws.o | ||
455 | Only in qte-2.3.7/src/kernel: qdialog.o | ||
456 | Only in qte-2.3.7/src/kernel: qdirectpainter_qws.o | ||
457 | Only in qte-2.3.7/src/kernel: qdnd_qws.o | ||
458 | Only in qte-2.3.7/src/kernel: qdragobject.o | ||
459 | Only in qte-2.3.7/src/kernel: qdrawutil.o | ||
460 | Only in qte-2.3.7/src/kernel: qdropsite.o | ||
461 | Only in qte-2.3.7/src/kernel: qevent.o | ||
462 | Only in qte-2.3.7/src/kernel: qfocusdata.o | ||
463 | Only in qte-2.3.7/src/kernel: qfont.o | ||
464 | Only in qte-2.3.7/src/kernel: qfont_qws.o | ||
465 | diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontdatabase.cpp | ||
466 | --- qte-2.3.7_orig/src/kernel/qfontdatabase.cppThu Jul 17 03:20:25 2003 | ||
467 | +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003 | 376 | +++ qte-2.3.7/src/kernel/qfontdatabase.cppMon Oct 27 14:21:28 2003 |
468 | @@ -35,6 +35,8 @@ | 377 | @@ -35,6 +35,8 @@ |
469 | ** | 378 | ** |
@@ -488,8 +397,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.cpp qte-2.3.7/src/kernel/qfontd | |||
488 | const QString &style, | 397 | const QString &style, |
489 | const QString &charSet ) | 398 | const QString &charSet ) |
490 | { | 399 | { |
491 | diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h | 400 | diff -ru qt-2.3.7/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdatabase.h |
492 | --- qte-2.3.7_orig/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003 | 401 | --- qt-2.3.7/src/kernel/qfontdatabase.hThu Jul 17 03:20:25 2003 |
493 | +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003 | 402 | +++ qte-2.3.7/src/kernel/qfontdatabase.hMon Oct 27 14:21:28 2003 |
494 | @@ -59,6 +59,10 @@ | 403 | @@ -59,6 +59,10 @@ |
495 | class QDiskFont; | 404 | class QDiskFont; |
@@ -520,12 +429,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qfontdatabase.h qte-2.3.7/src/kernel/qfontdat | |||
520 | QStringList styles( const QString &family, | 429 | QStringList styles( const QString &family, |
521 | const QString &charSet = QString::null ) const; | 430 | const QString &charSet = QString::null ) const; |
522 | QStringList charSets( const QString &familyName, | 431 | QStringList charSets( const QString &familyName, |
523 | Only in qte-2.3.7/src/kernel: qfontdatabase.o | 432 | diff -ru qt-2.3.7/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp |
524 | Only in qte-2.3.7/src/kernel: qfontfactorybdf_qws.o | 433 | --- qt-2.3.7/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003 |
525 | Only in qte-2.3.7/src/kernel: qfontfactoryttf_qws.o | ||
526 | Only in qte-2.3.7/src/kernel: qfontmanager_qws.o | ||
527 | diff -ru qte-2.3.7_orig/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cpp | ||
528 | --- qte-2.3.7_orig/src/kernel/qgfx_qws.cppThu Jul 17 03:20:25 2003 | ||
529 | +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003 | 434 | +++ qte-2.3.7/src/kernel/qgfx_qws.cppMon Oct 27 14:27:25 2003 |
530 | @@ -32,7 +32,7 @@ | 435 | @@ -32,7 +32,7 @@ |
531 | #include "qgfx_qws.h" | 436 | #include "qgfx_qws.h" |
@@ -536,9 +441,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qgfx_qws.cpp qte-2.3.7/src/kernel/qgfx_qws.cp | |||
536 | #include <sys/types.h> | 441 | #include <sys/types.h> |
537 | #include <dirent.h> | 442 | #include <dirent.h> |
538 | #include <stdlib.h> | 443 | #include <stdlib.h> |
539 | Only in qte-2.3.7/src/kernel: qgfx_qws.o | 444 | diff -ru qt-2.3.7/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp |
540 | diff -ru qte-2.3.7_orig/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxraster_qws.cpp | 445 | --- qt-2.3.7/src/kernel/qgfxraster_qws.cppThu Jul 17 03:20:25 2003 |
541 | --- qte-2.3.7_orig/src/kernel/qgfxraster_qws.cppThu Jul 17 03:20:25 2003 | ||
542 | +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003 | 446 | +++ qte-2.3.7/src/kernel/qgfxraster_qws.cppMon Oct 27 14:27:25 2003 |
543 | @@ -75,7 +75,11 @@ | 447 | @@ -75,7 +75,11 @@ |
544 | # if __BYTE_ORDER == __BIG_ENDIAN | 448 | # if __BYTE_ORDER == __BIG_ENDIAN |
@@ -598,15 +502,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qgfxraster_qws.cpp qte-2.3.7/src/kernel/qgfxr | |||
598 | // ### fix for 8bpp | 502 | // ### fix for 8bpp |
599 | // This seems to be reliable now, at least for 16bpp | 503 | // This seems to be reliable now, at least for 16bpp |
600 | 504 | ||
601 | Only in qte-2.3.7/src/kernel: qgfxraster_qws.cpp~ | 505 | diff -ru qt-2.3.7/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp |
602 | Only in qte-2.3.7/src/kernel: qgfxraster_qws.o | 506 | --- qt-2.3.7/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003 |
603 | Only in qte-2.3.7/src/kernel: qguardedptr.o | ||
604 | Only in qte-2.3.7/src/kernel: qiconset.o | ||
605 | Only in qte-2.3.7/src/kernel: qimage.o | ||
606 | Only in qte-2.3.7/src/kernel: qinputcontext_qws.o | ||
607 | Only in qte-2.3.7/src/kernel: qjpegio.o | ||
608 | diff -ru qte-2.3.7_orig/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeyboard_qws.cpp | ||
609 | --- qte-2.3.7_orig/src/kernel/qkeyboard_qws.cppThu Jul 17 03:20:25 2003 | ||
610 | +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003 | 507 | +++ qte-2.3.7/src/kernel/qkeyboard_qws.cppMon Oct 27 14:42:11 2003 |
611 | @@ -69,7 +69,7 @@ | 508 | @@ -69,7 +69,7 @@ |
612 | #if !defined(_OS_QNX6_) | 509 | #if !defined(_OS_QNX6_) |
@@ -675,15 +572,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qkeyboard_qws.cpp qte-2.3.7/src/kernel/qkeybo | |||
675 | ioctl(kbdFD, KDSKBMODE, K_XLATE); | 572 | ioctl(kbdFD, KDSKBMODE, K_XLATE); |
676 | #endif | 573 | #endif |
677 | tcsetattr(kbdFD, TCSANOW, &origTermData); | 574 | tcsetattr(kbdFD, TCSANOW, &origTermData); |
678 | Only in qte-2.3.7/src/kernel: qkeyboard_qws.cpp.rej | 575 | diff -ru qt-2.3.7/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp |
679 | Only in qte-2.3.7/src/kernel: qkeyboard_qws.cpp~ | 576 | --- qt-2.3.7/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003 |
680 | Only in qte-2.3.7/src/kernel: qkeyboard_qws.moc | ||
681 | Only in qte-2.3.7/src/kernel: qkeyboard_qws.o | ||
682 | Only in qte-2.3.7/src/kernel: qlayout.o | ||
683 | Only in qte-2.3.7/src/kernel: qlayoutengine.o | ||
684 | Only in qte-2.3.7/src/kernel: qlocalfs.o | ||
685 | diff -ru qte-2.3.7_orig/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws.cpp | ||
686 | --- qte-2.3.7_orig/src/kernel/qlock_qws.cppThu Jul 17 03:20:25 2003 | ||
687 | +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003 | 577 | +++ qte-2.3.7/src/kernel/qlock_qws.cppMon Oct 27 14:27:25 2003 |
688 | @@ -38,7 +38,7 @@ | 578 | @@ -38,7 +38,7 @@ |
689 | #include <errno.h> | 579 | #include <errno.h> |
@@ -694,58 +584,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qlock_qws.cpp qte-2.3.7/src/kernel/qlock_qws. | |||
694 | /* union semun is defined by including <sys/sem.h> */ | 584 | /* union semun is defined by including <sys/sem.h> */ |
695 | #else | 585 | #else |
696 | /* according to X/OPEN we have to define it ourselves */ | 586 | /* according to X/OPEN we have to define it ourselves */ |
697 | Only in qte-2.3.7/src/kernel: qlock_qws.o | 587 | diff -ru qt-2.3.7/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp |
698 | Only in qte-2.3.7/src/kernel: qmemorymanager_qws.o | 588 | --- qt-2.3.7/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003 |
699 | Only in qte-2.3.7/src/kernel: qmetaobject.o | ||
700 | Only in qte-2.3.7/src/kernel: qmime.o | ||
701 | Only in qte-2.3.7/src/kernel: qmngio.o | ||
702 | Only in qte-2.3.7/src/kernel: qmovie.moc | ||
703 | Only in qte-2.3.7/src/kernel: qmovie.o | ||
704 | Only in qte-2.3.7/src/kernel: qnetworkprotocol.o | ||
705 | Only in qte-2.3.7/src/kernel: qobject.o | ||
706 | Only in qte-2.3.7/src/kernel: qpaintdevice_qws.o | ||
707 | Only in qte-2.3.7/src/kernel: qpaintdevicemetrics.o | ||
708 | Only in qte-2.3.7/src/kernel: qpainter.o | ||
709 | Only in qte-2.3.7/src/kernel: qpainter_qws.o | ||
710 | Only in qte-2.3.7/src/kernel: qpalette.o | ||
711 | Only in qte-2.3.7/src/kernel: qpicture.o | ||
712 | Only in qte-2.3.7/src/kernel: qpixmap.o | ||
713 | Only in qte-2.3.7/src/kernel: qpixmap_qws.o | ||
714 | Only in qte-2.3.7/src/kernel: qpixmapcache.o | ||
715 | Only in qte-2.3.7/src/kernel: qpngio.o | ||
716 | Only in qte-2.3.7/src/kernel: qpoint.o | ||
717 | Only in qte-2.3.7/src/kernel: qprinter.o | ||
718 | Only in qte-2.3.7/src/kernel: qprinter_qws.o | ||
719 | Only in qte-2.3.7/src/kernel: qpsprinter.o | ||
720 | Only in qte-2.3.7/src/kernel: qrect.o | ||
721 | Only in qte-2.3.7/src/kernel: qregion.o | ||
722 | Only in qte-2.3.7/src/kernel: qrichtext.o | ||
723 | Only in qte-2.3.7/src/kernel: qsemimodal.o | ||
724 | Only in qte-2.3.7/src/kernel: qsharedmemory.o | ||
725 | Only in qte-2.3.7/src/kernel: qsignal.o | ||
726 | Only in qte-2.3.7/src/kernel: qsignalmapper.o | ||
727 | Only in qte-2.3.7/src/kernel: qsimplerichtext.o | ||
728 | Only in qte-2.3.7/src/kernel: qsize.o | ||
729 | Only in qte-2.3.7/src/kernel: qsizegrip.o | ||
730 | Only in qte-2.3.7/src/kernel: qsocketnotifier.o | ||
731 | Only in qte-2.3.7/src/kernel: qsound.o | ||
732 | Only in qte-2.3.7/src/kernel: qsound_qws.o | ||
733 | Only in qte-2.3.7/src/kernel: qsoundqss_qws.moc | ||
734 | Only in qte-2.3.7/src/kernel: qsoundqss_qws.o | ||
735 | Only in qte-2.3.7/src/kernel: qstyle.o | ||
736 | Only in qte-2.3.7/src/kernel: qstylesheet.o | ||
737 | Only in qte-2.3.7/src/kernel: qthread_unix.moc | ||
738 | Only in qte-2.3.7/src/kernel: qthread_unix.o | ||
739 | Only in qte-2.3.7/src/kernel: qtimer.o | ||
740 | Only in qte-2.3.7/src/kernel: qtranslator.o | ||
741 | Only in qte-2.3.7/src/kernel: qurl.o | ||
742 | Only in qte-2.3.7/src/kernel: qurlinfo.o | ||
743 | Only in qte-2.3.7/src/kernel: qurloperator.o | ||
744 | Only in qte-2.3.7/src/kernel: qvariant.o | ||
745 | Only in qte-2.3.7/src/kernel: qwidget.o | ||
746 | Only in qte-2.3.7/src/kernel: qwidget_qws.o | ||
747 | diff -ru qte-2.3.7_orig/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qwindowsystem_qws.cpp | ||
748 | --- qte-2.3.7_orig/src/kernel/qwindowsystem_qws.cppThu Jul 17 03:20:26 2003 | ||
749 | +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003 | 589 | +++ qte-2.3.7/src/kernel/qwindowsystem_qws.cppMon Oct 27 14:27:25 2003 |
750 | @@ -844,6 +844,18 @@ | 590 | @@ -844,6 +844,18 @@ |
751 | { | 591 | { |
@@ -783,21 +623,8 @@ diff -ru qte-2.3.7_orig/src/kernel/qwindowsystem_qws.cpp qte-2.3.7/src/kernel/qw | |||
783 | if( mount(0, "/var/shm", "shm", 0, 0) ) { | 623 | if( mount(0, "/var/shm", "shm", 0, 0) ) { |
784 | /* This just confuses people with 2.2 kernels | 624 | /* This just confuses people with 2.2 kernels |
785 | if ( errno != EBUSY ) | 625 | if ( errno != EBUSY ) |
786 | Only in qte-2.3.7/src/kernel: qwindowsystem_qws.cpp~ | 626 | diff -ru qt-2.3.7/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp |
787 | Only in qte-2.3.7/src/kernel: qwindowsystem_qws.o | 627 | --- qt-2.3.7/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003 |
788 | Only in qte-2.3.7/src/kernel: qwmatrix.o | ||
789 | Only in qte-2.3.7/src/kernel: qwsbeosdecoration_qws.o | ||
790 | Only in qte-2.3.7/src/kernel: qwscommand_qws.o | ||
791 | Only in qte-2.3.7/src/kernel: qwscursor_qws.o | ||
792 | Only in qte-2.3.7/src/kernel: qwsdecoration_qws.o | ||
793 | Only in qte-2.3.7/src/kernel: qwsdefaultdecoration_qws.o | ||
794 | Only in qte-2.3.7/src/kernel: qwsevent_qws.o | ||
795 | Only in qte-2.3.7/src/kernel: qwshydrodecoration_qws.o | ||
796 | Only in qte-2.3.7/src/kernel: qwskde2decoration_qws.o | ||
797 | Only in qte-2.3.7/src/kernel: qwskdedecoration_qws.o | ||
798 | Only in qte-2.3.7/src/kernel: qwsmanager_qws.o | ||
799 | diff -ru qte-2.3.7_orig/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmouse_qws.cpp | ||
800 | --- qte-2.3.7_orig/src/kernel/qwsmouse_qws.cppThu Jul 17 03:20:26 2003 | ||
801 | +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003 | 628 | +++ qte-2.3.7/src/kernel/qwsmouse_qws.cppMon Oct 27 14:27:25 2003 |
802 | @@ -336,7 +336,7 @@ | 629 | @@ -336,7 +336,7 @@ |
803 | tty.c_oflag = 0; | 630 | tty.c_oflag = 0; |
@@ -817,50 +644,21 @@ diff -ru qte-2.3.7_orig/src/kernel/qwsmouse_qws.cpp qte-2.3.7/src/kernel/qwsmous | |||
817 | tty.c_line = 0; | 644 | tty.c_line = 0; |
818 | #endif // _OS_FREEBSD_ | 645 | #endif // _OS_FREEBSD_ |
819 | tty.c_cc[VTIME] = 0; | 646 | tty.c_cc[VTIME] = 0; |
820 | Only in qte-2.3.7/src/kernel: qwsmouse_qws.moc | 647 | diff -ru qt-2.3.7/src/network/qdns.cpp qte-2.3.7/src/network/qdns.cpp |
821 | Only in qte-2.3.7/src/kernel: qwsmouse_qws.o | 648 | --- qt-2.3.7/src/network/qdns.cppThu Jul 17 03:20:26 2003 |
822 | Only in qte-2.3.7/src/kernel: qwsproperty_qws.o | 649 | +++ qte-2.3.7/src/network/qdns.cppSun Nov 16 13:44:27 2003 |
823 | Only in qte-2.3.7/src/kernel: qwsregionmanager_qws.o | 650 | @@ -1991,7 +1991,7 @@ |
824 | Only in qte-2.3.7/src/kernel: qwssocket_qws.o | 651 | domains = new QStrList( TRUE ); |
825 | Only in qte-2.3.7/src/kernel: qwswindowsdecoration_qws.o | 652 | domains->setAutoDelete( TRUE ); |
826 | Only in qte-2.3.7/src/moc: Makefile | 653 | |
827 | Only in qte-2.3.7/src/moc: moc | 654 | - res_init(); |
828 | Only in qte-2.3.7/src/moc: mocgen.o | 655 | + // res_init(); (eilers: Caused link problems) |
829 | Only in qte-2.3.7/src/moc: qbuffer.o | 656 | int i; |
830 | Only in qte-2.3.7/src/moc: qcollection.o | 657 | // find the name servers to use |
831 | Only in qte-2.3.7/src/moc: qcstring.o | 658 | for( i=0; i < MAXNS && i < _res.nscount; i++ ) { |
832 | Only in qte-2.3.7/src/moc: qdatastream.o | 659 | diff -ru qt-2.3.7/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h |
833 | Only in qte-2.3.7/src/moc: qdatetime.o | 660 | --- qt-2.3.7/src/tools/qconfig.hFri Jan 26 14:43:06 2001 |
834 | Only in qte-2.3.7/src/moc: qfile.o | 661 | +++ qte-2.3.7/src/tools/qconfig.hSun Nov 16 13:35:10 2003 |
835 | Only in qte-2.3.7/src/moc: qfile_unix.o | ||
836 | Only in qte-2.3.7/src/moc: qgarray.o | ||
837 | Only in qte-2.3.7/src/moc: qgdict.o | ||
838 | Only in qte-2.3.7/src/moc: qglist.o | ||
839 | Only in qte-2.3.7/src/moc: qglobal.o | ||
840 | Only in qte-2.3.7/src/moc: qgvector.o | ||
841 | Only in qte-2.3.7/src/moc: qiodevice.o | ||
842 | Only in qte-2.3.7/src/moc: qregexp.o | ||
843 | Only in qte-2.3.7/src/moc: qstring.o | ||
844 | Only in qte-2.3.7/src/moc: qtextcodec.o | ||
845 | Only in qte-2.3.7/src/moc: qtextstream.o | ||
846 | Only in qte-2.3.7/src/moc: qutfcodec.o | ||
847 | Only in qte-2.3.7/src/network: qdns.o | ||
848 | Only in qte-2.3.7/src/network: qftp.o | ||
849 | Only in qte-2.3.7/src/network: qhostaddress.o | ||
850 | Only in qte-2.3.7/src/network: qnetwork.o | ||
851 | Only in qte-2.3.7/src/network: qserversocket.o | ||
852 | Only in qte-2.3.7/src/network: qsocket.o | ||
853 | Only in qte-2.3.7/src/network: qsocketdevice.o | ||
854 | Only in qte-2.3.7/src/network: qsocketdevice_unix.o | ||
855 | Only in qte-2.3.7/src/table: qtable.o | ||
856 | Only in qte-2.3.7/src/tools: qbitarray.o | ||
857 | Only in qte-2.3.7/src/tools: qbuffer.o | ||
858 | Only in qte-2.3.7/src/tools: qcollection.o | ||
859 | Only in qte-2.3.7/src/tools: qconfig-qpe.h | ||
860 | Only in qte-2.3.7/src/tools: qconfig-qpe.h~ | ||
861 | diff -ru qte-2.3.7_orig/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h | ||
862 | --- qte-2.3.7_orig/src/tools/qconfig.hFri Jan 26 14:43:06 2001 | ||
863 | +++ qte-2.3.7/src/tools/qconfig.hWed Oct 29 22:13:16 2003 | ||
864 | @@ -1,3 +1,26 @@ | 662 | @@ -1,3 +1,26 @@ |
865 | +// Copied from qconfig-qpe.h | 663 | +// Copied from qconfig-qpe.h |
866 | +/********************************************************************** | 664 | +/********************************************************************** |
@@ -888,7 +686,7 @@ diff -ru qte-2.3.7_orig/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h | |||
888 | // Empty leaves all features enabled. See doc/html/features.html for choices. | 686 | // Empty leaves all features enabled. See doc/html/features.html for choices. |
889 | 687 | ||
890 | // Note that disabling some features will produce a libqt that is not | 688 | // Note that disabling some features will produce a libqt that is not |
891 | @@ -8,3 +31,69 @@ | 689 | @@ -8,3 +31,71 @@ |
892 | #ifndef QT_DLL | 690 | #ifndef QT_DLL |
893 | #define QT_DLL // Internal | 691 | #define QT_DLL // Internal |
894 | #endif | 692 | #endif |
@@ -958,27 +756,12 @@ diff -ru qte-2.3.7_orig/src/tools/qconfig.h qte-2.3.7/src/tools/qconfig.h | |||
958 | +#define QT_NO_QWS_KDE2_WM_STYLE | 756 | +#define QT_NO_QWS_KDE2_WM_STYLE |
959 | +#define QT_NO_QWS_KDE_WM_STYLE | 757 | +#define QT_NO_QWS_KDE_WM_STYLE |
960 | +#define QT_NO_QWS_WINDOWS_WM_STYLE | 758 | +#define QT_NO_QWS_WINDOWS_WM_STYLE |
961 | Only in qte-2.3.7/src/tools: qconfig.h~ | 759 | + |
962 | Only in qte-2.3.7/src/tools: qcstring.o | 760 | +#define QT_NO_SOUND |
963 | Only in qte-2.3.7/src/tools: qdatastream.o | 761 | \ No newline at end of file |
964 | Only in qte-2.3.7/src/tools: qdatetime.o | 762 | diff -ru qt-2.3.7/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h |
965 | Only in qte-2.3.7/src/tools: qdir.o | 763 | --- qt-2.3.7/src/tools/qmodules.hFri Aug 31 17:00:56 2001 |
966 | Only in qte-2.3.7/src/tools: qdir_unix.o | 764 | +++ qte-2.3.7/src/tools/qmodules.hSun Nov 16 13:34:58 2003 |
967 | Only in qte-2.3.7/src/tools: qfile.o | ||
968 | Only in qte-2.3.7/src/tools: qfile_unix.o | ||
969 | Only in qte-2.3.7/src/tools: qfileinfo.o | ||
970 | Only in qte-2.3.7/src/tools: qfileinfo_unix.o | ||
971 | Only in qte-2.3.7/src/tools: qgarray.o | ||
972 | Only in qte-2.3.7/src/tools: qgcache.o | ||
973 | Only in qte-2.3.7/src/tools: qgdict.o | ||
974 | Only in qte-2.3.7/src/tools: qglist.o | ||
975 | Only in qte-2.3.7/src/tools: qglobal.o | ||
976 | Only in qte-2.3.7/src/tools: qgvector.o | ||
977 | Only in qte-2.3.7/src/tools: qiodevice.o | ||
978 | Only in qte-2.3.7/src/tools: qmap.o | ||
979 | diff -ru qte-2.3.7_orig/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h | ||
980 | --- qte-2.3.7_orig/src/tools/qmodules.hFri Aug 31 17:00:56 2001 | ||
981 | +++ qte-2.3.7/src/tools/qmodules.hWed Oct 29 21:57:53 2003 | ||
982 | @@ -1,14 +1,12 @@ | 765 | @@ -1,14 +1,12 @@ |
983 | -#ifndef QT_H | 766 | -#ifndef QT_H |
984 | -#endif // QT_H | 767 | -#endif // QT_H |
@@ -998,20 +781,8 @@ diff -ru qte-2.3.7_orig/src/tools/qmodules.h qte-2.3.7/src/tools/qmodules.h | |||
998 | #define QT_MODULE_XML | 781 | #define QT_MODULE_XML |
999 | -#define QT_MODULE_NETWORK | 782 | -#define QT_MODULE_NETWORK |
1000 | +#define QT_MODULE_OPENGL | 783 | +#define QT_MODULE_OPENGL |
1001 | Only in qte-2.3.7/src/tools: qregexp.o | 784 | diff -ru qt-2.3.7/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp |
1002 | Only in qte-2.3.7/src/tools: qstring.o | 785 | --- qt-2.3.7/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003 |
1003 | Only in qte-2.3.7/src/tools: qstringlist.o | ||
1004 | Only in qte-2.3.7/src/tools: qtextcodec.o | ||
1005 | Only in qte-2.3.7/src/tools: qtextstream.o | ||
1006 | Only in qte-2.3.7/src/tools: qutfcodec.o | ||
1007 | Only in qte-2.3.7/src/widgets: qaction.o | ||
1008 | Only in qte-2.3.7/src/widgets: qbutton.o | ||
1009 | Only in qte-2.3.7/src/widgets: qbuttongroup.o | ||
1010 | Only in qte-2.3.7/src/widgets: qcdestyle.o | ||
1011 | Only in qte-2.3.7/src/widgets: qcheckbox.o | ||
1012 | Only in qte-2.3.7/src/widgets: qcombobox.o | ||
1013 | diff -ru qte-2.3.7_orig/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcommonstyle.cpp | ||
1014 | --- qte-2.3.7_orig/src/widgets/qcommonstyle.cppThu Jul 17 03:20:26 2003 | ||
1015 | +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003 | 786 | +++ qte-2.3.7/src/widgets/qcommonstyle.cppMon Oct 27 14:21:28 2003 |
1016 | @@ -566,7 +566,7 @@ | 787 | @@ -566,7 +566,7 @@ |
1017 | bool enabled, bool active ) | 788 | bool enabled, bool active ) |
@@ -1022,25 +793,8 @@ diff -ru qte-2.3.7_orig/src/widgets/qcommonstyle.cpp qte-2.3.7/src/widgets/qcomm | |||
1022 | if (draw_menu_bar_impl != 0) { | 793 | if (draw_menu_bar_impl != 0) { |
1023 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; | 794 | QDrawMenuBarItemImpl impl = draw_menu_bar_impl; |
1024 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); | 795 | (this->*impl)(p, x, y, w, h, mi, g, enabled, active); |
1025 | Only in qte-2.3.7/src/widgets: qcommonstyle.o | 796 | diff -ru qt-2.3.7/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp |
1026 | Only in qte-2.3.7/src/widgets: qcompactstyle.o | 797 | --- qt-2.3.7/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003 |
1027 | Only in qte-2.3.7/src/widgets: qdial.o | ||
1028 | Only in qte-2.3.7/src/widgets: qeffects.moc | ||
1029 | Only in qte-2.3.7/src/widgets: qeffects.o | ||
1030 | Only in qte-2.3.7/src/widgets: qframe.o | ||
1031 | Only in qte-2.3.7/src/widgets: qgrid.o | ||
1032 | Only in qte-2.3.7/src/widgets: qgroupbox.o | ||
1033 | Only in qte-2.3.7/src/widgets: qhbox.o | ||
1034 | Only in qte-2.3.7/src/widgets: qhbuttongroup.o | ||
1035 | Only in qte-2.3.7/src/widgets: qheader.o | ||
1036 | Only in qte-2.3.7/src/widgets: qhgroupbox.o | ||
1037 | Only in qte-2.3.7/src/widgets: qinterlacestyle.o | ||
1038 | Only in qte-2.3.7/src/widgets: qlabel.o | ||
1039 | Only in qte-2.3.7/src/widgets: qlcdnumber.o | ||
1040 | Only in qte-2.3.7/src/widgets: qlineedit.o | ||
1041 | Only in qte-2.3.7/src/widgets: qlistbox.o | ||
1042 | diff -ru qte-2.3.7_orig/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistview.cpp | ||
1043 | --- qte-2.3.7_orig/src/widgets/qlistview.cppThu Jul 17 03:20:26 2003 | ||
1044 | +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003 | 798 | +++ qte-2.3.7/src/widgets/qlistview.cppMon Oct 27 14:21:28 2003 |
1045 | @@ -4968,9 +4968,9 @@ | 799 | @@ -4968,9 +4968,9 @@ |
1046 | l = l->childItem ? l->childItem : l->siblingItem; | 800 | l = l->childItem ? l->childItem : l->siblingItem; |
@@ -1055,36 +809,8 @@ diff -ru qte-2.3.7_orig/src/widgets/qlistview.cpp qte-2.3.7/src/widgets/qlistvie | |||
1055 | 809 | ||
1056 | if ( s.width() > s.height() * 3 ) | 810 | if ( s.width() > s.height() * 3 ) |
1057 | s.setHeight( s.width() / 3 ); | 811 | s.setHeight( s.width() / 3 ); |
1058 | Only in qte-2.3.7/src/widgets: qlistview.o | 812 | diff -ru qt-2.3.7/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp |
1059 | Only in qte-2.3.7/src/widgets: qmainwindow.moc | 813 | --- qt-2.3.7/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003 |
1060 | Only in qte-2.3.7/src/widgets: qmainwindow.o | ||
1061 | Only in qte-2.3.7/src/widgets: qmenubar.o | ||
1062 | Only in qte-2.3.7/src/widgets: qmenudata.o | ||
1063 | Only in qte-2.3.7/src/widgets: qmotifplusstyle.o | ||
1064 | Only in qte-2.3.7/src/widgets: qmotifstyle.o | ||
1065 | Only in qte-2.3.7/src/widgets: qmultilineedit.o | ||
1066 | Only in qte-2.3.7/src/widgets: qplatinumstyle.o | ||
1067 | Only in qte-2.3.7/src/widgets: qpopupmenu.o | ||
1068 | Only in qte-2.3.7/src/widgets: qprogressbar.o | ||
1069 | Only in qte-2.3.7/src/widgets: qpushbutton.o | ||
1070 | Only in qte-2.3.7/src/widgets: qradiobutton.o | ||
1071 | Only in qte-2.3.7/src/widgets: qrangecontrol.o | ||
1072 | Only in qte-2.3.7/src/widgets: qscrollbar.o | ||
1073 | Only in qte-2.3.7/src/widgets: qscrollview.o | ||
1074 | Only in qte-2.3.7/src/widgets: qsgistyle.o | ||
1075 | Only in qte-2.3.7/src/widgets: qslider.o | ||
1076 | Only in qte-2.3.7/src/widgets: qspinbox.o | ||
1077 | Only in qte-2.3.7/src/widgets: qsplitter.o | ||
1078 | Only in qte-2.3.7/src/widgets: qstatusbar.o | ||
1079 | Only in qte-2.3.7/src/widgets: qtabbar.o | ||
1080 | Only in qte-2.3.7/src/widgets: qtableview.o | ||
1081 | Only in qte-2.3.7/src/widgets: qtabwidget.o | ||
1082 | Only in qte-2.3.7/src/widgets: qtextbrowser.o | ||
1083 | Only in qte-2.3.7/src/widgets: qtextview.o | ||
1084 | Only in qte-2.3.7/src/widgets: qtoolbar.moc | ||
1085 | Only in qte-2.3.7/src/widgets: qtoolbar.o | ||
1086 | diff -ru qte-2.3.7_orig/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolbutton.cpp | ||
1087 | --- qte-2.3.7_orig/src/widgets/qtoolbutton.cppThu Jul 17 03:20:27 2003 | ||
1088 | +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003 | 814 | +++ qte-2.3.7/src/widgets/qtoolbutton.cppMon Oct 27 14:21:28 2003 |
1089 | @@ -230,7 +230,7 @@ | 815 | @@ -230,7 +230,7 @@ |
1090 | else | 816 | else |
@@ -1113,49 +839,3 @@ diff -ru qte-2.3.7_orig/src/widgets/qtoolbutton.cpp qte-2.3.7/src/widgets/qtoolb | |||
1113 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); | 839 | QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); |
1114 | w = pm.width(); | 840 | w = pm.width(); |
1115 | h = pm.height(); | 841 | h = pm.height(); |
1116 | Only in qte-2.3.7/src/widgets: qtoolbutton.o | ||
1117 | Only in qte-2.3.7/src/widgets: qtooltip.moc | ||
1118 | Only in qte-2.3.7/src/widgets: qtooltip.o | ||
1119 | Only in qte-2.3.7/src/widgets: qvalidator.o | ||
1120 | Only in qte-2.3.7/src/widgets: qvbox.o | ||
1121 | Only in qte-2.3.7/src/widgets: qvbuttongroup.o | ||
1122 | Only in qte-2.3.7/src/widgets: qvgroupbox.o | ||
1123 | Only in qte-2.3.7/src/widgets: qwhatsthis.moc | ||
1124 | Only in qte-2.3.7/src/widgets: qwhatsthis.o | ||
1125 | Only in qte-2.3.7/src/widgets: qwidgetstack.o | ||
1126 | Only in qte-2.3.7/src/widgets: qwindowsstyle.o | ||
1127 | Only in qte-2.3.7/src/workspace: qworkspace.moc | ||
1128 | Only in qte-2.3.7/src/workspace: qworkspace.o | ||
1129 | Only in qte-2.3.7/src/xml: qdom.o | ||
1130 | Only in qte-2.3.7/src/xml: qxml.o | ||
1131 | Only in qte-2.3.7: src-mt.mk | ||
1132 | Only in qte-2.3.7: stamp-headers | ||
1133 | Only in qte-2.3.7/tools: Makefile | ||
1134 | Only in qte-2.3.7/tools/designer: Makefile | ||
1135 | Only in qte-2.3.7/tools/designer/designer: Makefile | ||
1136 | Only in qte-2.3.7/tools/designer/examples/walkthrough: Makefile | ||
1137 | Only in qte-2.3.7/tools/designer/integration/rc2ui: Makefile | ||
1138 | Only in qte-2.3.7/tools/designer/tools/createcw: Makefile | ||
1139 | Only in qte-2.3.7/tools/designer/uic: Makefile | ||
1140 | Only in qte-2.3.7/tools/designer/util: Makefile | ||
1141 | Only in qte-2.3.7/tools/makeqpf: Makefile | ||
1142 | Only in qte-2.3.7/tools/mergetr: Makefile | ||
1143 | Only in qte-2.3.7/tools/msg2qm: Makefile | ||
1144 | Only in qte-2.3.7/tools/qconfig: Makefile | ||
1145 | Only in qte-2.3.7/tools/qembed: Makefile | ||
1146 | Only in qte-2.3.7/tools/qvfb: Makefile | ||
1147 | Only in qte-2.3.7/tutorial: Makefile | ||
1148 | Only in qte-2.3.7/tutorial/t1: Makefile | ||
1149 | Only in qte-2.3.7/tutorial/t10: Makefile | ||
1150 | Only in qte-2.3.7/tutorial/t11: Makefile | ||
1151 | Only in qte-2.3.7/tutorial/t12: Makefile | ||
1152 | Only in qte-2.3.7/tutorial/t13: Makefile | ||
1153 | Only in qte-2.3.7/tutorial/t14: Makefile | ||
1154 | Only in qte-2.3.7/tutorial/t2: Makefile | ||
1155 | Only in qte-2.3.7/tutorial/t3: Makefile | ||
1156 | Only in qte-2.3.7/tutorial/t4: Makefile | ||
1157 | Only in qte-2.3.7/tutorial/t5: Makefile | ||
1158 | Only in qte-2.3.7/tutorial/t6: Makefile | ||
1159 | Only in qte-2.3.7/tutorial/t7: Makefile | ||
1160 | Only in qte-2.3.7/tutorial/t8: Makefile | ||
1161 | Only in qte-2.3.7/tutorial/t9: Makefile | ||