Changeset 17153 for trunk/dports


Ignore:
Timestamp:
Mar 24, 2006, 6:21:29 PM (18 years ago)
Author:
takanori
Message:

Version bumped to 3.3.6

Location:
trunk/dports/x11/qt3
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/dports/x11/qt3/Portfile

    r16914 r17153  
    1 # $Id: Portfile,v 1.45 2006/03/13 09:37:58 takanori Exp $
     1# $Id: Portfile,v 1.46 2006/03/24 18:21:29 takanori Exp $
    22
    33PortSystem 1.0
    44name            qt3
    5 version         3.3.5
    6 revision        1
     5version         3.3.6
    76categories      x11
    87maintainers     ben@opendarwin.org takanori@opendarwin.org
    … …  
    2827                port:zlib
    2928
    30 checksums       ${distname}.tar.bz2 md5 05d04688c0c0230ed54e89102d689ca4 \
     29checksums       ${distname}.tar.bz2 md5 dc1384c03ac08af21f6fefab32d982cf \
    3130                qt-upstream-patches-0002.tar.bz2 md5 85bd46f2c4b820ae6b64271dae173b4b
    3231
    … …  
    8988                            patches/0047-fix-kmenu-width.rr.diff \
    9089                            patches/0048-qclipboard_hack_80072.rr.patch \
    91                             patches/0051-qtoolbar_77047.rr.patch \
    9290                            patches/0056-khotkeys_input_84434.rr.patch \
    93                             patches/qt-x11-free-3.3.4-assistant_de.patch \
    94                             patches/qt-x11-free-3.3.4-fullscreen.patch \
    95                             patches/qt-x11-free-3.3.5-warning.patch } {
     91                            patches/qt-x11-free-3.3.4-fullscreen.patch } {
    9692                                system "cd ${worksrcpath} && patch -p1 --fuzz=4 < ${workpath}/${p}"
    9793                }
    9894}
    9995
    100 configure.env   DYLD_FALLBACK_LIBRARY_PATH='${worksrcpath}/lib:/usr/lib' \
     96configure.env   DYLD_FALLBACK_LIBRARY_PATH='${worksrcpath}/lib:${worksrcpath}/lib/qt3-plugins/designer:${worksrcpath}/lib/qt3-plugins/imageformats:/usr/lib' \
    10197                INSTALL_ROOT='' \
    10298                QMAKESPEC='${worksrcpath}/mkspecs/darwin-g++' \

  • trunk/dports/x11/qt3/files/qt3-panther.patch

    r16914 r17153  
    1 --- qt-x11-free-3.3.5/Makefile  2005-01-03 11:08:00.000000000 -0500
    2 +++ qt-x11-free-3.3.5-new/Makefile      2006-02-11 11:24:10.000000000 -0500
     1diff -uNr qt-x11-free-3.3.6/Makefile qt-x11-free-3.3.6-new/Makefile
     2--- qt-x11-free-3.3.6/Makefile  2005-01-03 11:08:00.000000000 -0500
     3+++ qt-x11-free-3.3.6-new/Makefile      2006-03-15 21:47:34.000000000 -0500
    34@@ -11,7 +11,7 @@
    45 install: FORCE
    … …  
    1011        @echo "The Qt library is now built in ./lib"
    1112        @echo "The Qt examples are built in the directories in ./examples"
    12 --- qt-x11-free-3.3.5/configure 2005-08-22 05:31:26.000000000 -0400
    13 +++ qt-x11-free-3.3.5-new/configure     2006-02-11 11:24:11.000000000 -0500
     13diff -uNr qt-x11-free-3.3.6/configure qt-x11-free-3.3.6-new/configure
     14--- qt-x11-free-3.3.6/configure 2006-03-08 07:11:24.000000000 -0500
     15+++ qt-x11-free-3.3.6-new/configure     2006-03-15 21:50:20.000000000 -0500
    1416@@ -36,7 +36,7 @@
    1517 
    … …  
    2123 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    2224 
    23 @@ -1046,8 +1046,8 @@
     25@@ -1051,8 +1051,8 @@
    2426 [ -z "$QT_INSTALL_DATA" ]         && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
    2527 # default PREFIX/translations
    … …  
    3234 # generate qconfig.cpp
    3335 [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
    34 @@ -3031,7 +3031,7 @@
     36@@ -3085,7 +3085,7 @@
    3537        COMPILER_VERSION="3.*"
    3638        ;;
    … …  
    4143     *)
    4244        ;;
    43 --- qt-x11-free-3.3.5/include/private/qcom_p.h  2005-09-02 08:42:53.000000000 -0400
    44 +++ qt-x11-free-3.3.5-new/include/private/qcom_p.h      2006-02-11 11:24:10.000000000 -0500
    45 @@ -53,6 +53,10 @@
    46  #include "quuid.h"
    47  #endif // QT_H
    48  
    49 +#if __GNUC__ - 0 > 3
    50 +#pragma GCC system_header
    51 +#endif
    52 +
    53  #ifndef QT_NO_COMPONENT
    54  
    55  class QObject;
    56 --- qt-x11-free-3.3.5/include/private/qimageformatinterface_p.h 2005-09-02 08:43:04.000000000 -0400
    57 +++ qt-x11-free-3.3.5-new/include/private/qimageformatinterface_p.h     2006-02-11 11:24:10.000000000 -0500
    58 @@ -40,6 +40,9 @@
    59  #include <private/qcom_p.h>
    60  #endif // QT_H
    61  
    62 +#if __GNUC__ - 0 > 3
    63 +#pragma GCC system_header
    64 +#endif
    65  
    66  //
    67  //  W A R N I N G
    68 --- qt-x11-free-3.3.5/include/private/qucom_p.h 2005-09-02 08:42:54.000000000 -0400
    69 +++ qt-x11-free-3.3.5-new/include/private/qucom_p.h     2006-02-11 11:24:10.000000000 -0500
    70 @@ -59,6 +59,10 @@
    71  #undef check
    72  #endif
    73  
    74 +#if __GNUC__ - 0 > 3
    75 +#pragma GCC system_header
    76 +#endif
    77 +
    78  struct QUObject;
    79  struct QUInterfaceDescription;
    80  struct QUnknownInterface;
    81 --- qt-x11-free-3.3.5/include/private/qucomextra_p.h    2005-09-02 08:43:01.000000000 -0400
    82 +++ qt-x11-free-3.3.5-new/include/private/qucomextra_p.h        2006-02-11 11:24:10.000000000 -0500
    83 @@ -54,6 +54,9 @@
    84  #include <private/qucom_p.h>
    85  #endif // QT_H
    86  
    87 +#if __GNUC__ - 0 > 3
    88 +#pragma GCC system_header
    89 +#endif
    90  
    91  class QVariant;
    92  
    93 --- qt-x11-free-3.3.5/include/qasyncimageio.h   2005-09-02 08:43:05.000000000 -0400
    94 +++ qt-x11-free-3.3.5-new/include/qasyncimageio.h       2006-02-11 11:24:10.000000000 -0500
    95 @@ -44,6 +44,9 @@
    96  
    97  #ifndef QT_NO_ASYNC_IMAGE_IO
    98  
    99 +#if __GNUC__ - 0 > 3
    100 +#pragma GCC system_header
    101 +#endif
    102  
    103  class Q_EXPORT QImageConsumer {
    104  public:
    105 --- qt-x11-free-3.3.5/include/qfiledialog.h     2005-09-02 08:42:52.000000000 -0400
    106 +++ qt-x11-free-3.3.5-new/include/qfiledialog.h 2006-02-11 11:24:10.000000000 -0500
    107 @@ -58,6 +58,10 @@
    108  #include "qurlinfo.h"
    109  #endif // QT_H
    110  
    111 +#if __GNUC__ - 0 > 3
    112 +#pragma GCC system_header
    113 +#endif
    114 +
    115  #ifndef QT_NO_FILEDIALOG
    116  
    117  class Q_EXPORT QFileIconProvider : public QObject
    118 --- qt-x11-free-3.3.5/include/qglobal.h 2005-09-02 08:42:53.000000000 -0400
    119 +++ qt-x11-free-3.3.5-new/include/qglobal.h     2006-02-11 11:36:55.000000000 -0500
     45diff -uNr qt-x11-free-3.3.6/include/qglobal.h qt-x11-free-3.3.6-new/include/qglobal.h
     46--- qt-x11-free-3.3.6/include/qglobal.h 2006-03-08 11:47:38.000000000 -0500
     47+++ qt-x11-free-3.3.6-new/include/qglobal.h     2006-03-15 21:47:34.000000000 -0500
    12048@@ -44,6 +44,10 @@
    12149  */
    122  #define QT_VERSION 0x030305
     50 #define QT_VERSION 0x030306
    12351 
    12452+#ifndef __DARWIN_X11__
    … …  
    12957    The operating system, must be one of: (Q_OS_x)
    13058 
    131 @@ -545,6 +549,8 @@
     59@@ -562,6 +566,8 @@
    13260 
    13361 #if defined(Q_OS_MAC9)
    … …  
    13866 #  define Q_WS_WIN16
    13967 #  error "Qt requires Win32 and does not work with Windows 3.x"
    140 @@ -865,6 +871,10 @@
     68@@ -882,6 +888,10 @@
    14169 #    define Q_TEMPLATE_EXTERN
    14270 #    undef  Q_DISABLE_COPY     /* avoid unresolved externals */
    … …  
    14977 #  undef QT_MAKEDLL            /* ignore these for other platforms */
    15078 #  undef QT_DLL
    151 --- qt-x11-free-3.3.5/include/qnetworkprotocol.h        2005-09-02 08:43:05.000000000 -0400
    152 +++ qt-x11-free-3.3.5-new/include/qnetworkprotocol.h    2006-02-11 11:24:10.000000000 -0500
    153 @@ -47,6 +47,10 @@
    154  
    155  #ifndef QT_NO_NETWORKPROTOCOL
    156  
    157 +#if __GNUC__ - 0 > 3
    158 +#pragma GCC system_header
    159 +#endif
    160 +
    161  class QNetworkProtocol;
    162  class QNetworkOperation;
    163  class QTimer;
    164 --- qt-x11-free-3.3.5/include/qprogressbar.h    2005-09-02 08:43:14.000000000 -0400
    165 +++ qt-x11-free-3.3.5-new/include/qprogressbar.h        2006-02-11 11:24:11.000000000 -0500
     79diff -uNr qt-x11-free-3.3.6/include/qprogressbar.h qt-x11-free-3.3.6-new/include/qprogressbar.h
     80--- qt-x11-free-3.3.6/include/qprogressbar.h    2006-03-08 11:47:58.000000000 -0500
     81+++ qt-x11-free-3.3.6-new/include/qprogressbar.h        2006-03-15 21:47:34.000000000 -0500
    16682@@ -61,6 +61,7 @@
    16783 public:
    … …  
    18096 private:
    18197     int                total_steps;
    182 --- qt-x11-free-3.3.5/include/qtooltip.h        2005-09-02 08:43:15.000000000 -0400
    183 +++ qt-x11-free-3.3.5-new/include/qtooltip.h    2006-02-11 11:24:10.000000000 -0500
    184 @@ -42,6 +42,9 @@
    185  
    186  #ifndef QT_NO_TOOLTIP
    187  
    188 +#if __GNUC__  - 0 > 3
    189 +#pragma GCC system_header
    190 +#endif
    191  
    192  class QTipManager;
    193  class QIconViewToolTip;
    194 --- qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf     2005-09-02 08:43:37.000000000 -0400
    195 +++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qmake.conf 2006-02-11 11:24:10.000000000 -0500
     98diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf
     99--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf     2006-03-08 11:48:20.000000000 -0500
     100+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-15 21:47:34.000000000 -0500
    196101@@ -9,19 +9,19 @@
    197102 MAKEFILE_GENERATOR     = UNIX
    … …  
    299204+QMAKE_CHK_DIR_EXISTS   = /bin/test -d
    300205+QMAKE_MKDIR            = /bin/mkdir -p
    301 --- qt-x11-free-3.3.5/mkspecs/darwin-g++/qplatformdefs.h        2003-05-27 11:19:20.000000000 -0400
    302 +++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qplatformdefs.h    2006-02-11 11:24:10.000000000 -0500
     206diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h
     207--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h        2003-05-27 11:19:20.000000000 -0400
     208+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h    2006-03-15 21:47:34.000000000 -0500
    303209@@ -74,12 +74,13 @@
    304210 #define QT_SIGNAL_ARGS         int
    … …  
    316222 
    317223 #endif // QPLATFORMDEFS_H
    318 --- qt-x11-free-3.3.5/qmake/Makefile.unix       2004-09-13 14:24:42.000000000 -0400
    319 +++ qt-x11-free-3.3.5-new/qmake/Makefile.unix   2006-02-11 11:24:10.000000000 -0500
     224diff -uNr qt-x11-free-3.3.6/qmake/Makefile.unix qt-x11-free-3.3.6-new/qmake/Makefile.unix
     225--- qt-x11-free-3.3.6/qmake/Makefile.unix       2006-02-28 05:32:54.000000000 -0500
     226+++ qt-x11-free-3.3.6-new/qmake/Makefile.unix   2006-03-15 21:47:34.000000000 -0500
    320227@@ -36,8 +36,8 @@
    321228        -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
    … …  
    329236 qmake: $(OBJS) $(QOBJS)
    330237        $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
    331 --- qt-x11-free-3.3.5/qmake/main.cpp    2005-09-02 08:43:19.000000000 -0400
    332 +++ qt-x11-free-3.3.5-new/qmake/main.cpp        2006-02-11 11:24:10.000000000 -0500
     238diff -uNr qt-x11-free-3.3.6/qmake/main.cpp qt-x11-free-3.3.6-new/qmake/main.cpp
     239--- qt-x11-free-3.3.6/qmake/main.cpp    2006-03-08 11:48:02.000000000 -0500
     240+++ qt-x11-free-3.3.6-new/qmake/main.cpp        2006-03-15 21:47:34.000000000 -0500
    333241@@ -49,7 +49,7 @@
    334242 
    … …  
    340248 bool qt_resolve_symlinks = FALSE;
    341249 #endif
    342 --- qt-x11-free-3.3.5/src/dialogs/qfiledialog.h 2005-09-02 08:42:52.000000000 -0400
    343 +++ qt-x11-free-3.3.5-new/src/dialogs/qfiledialog.h     2006-02-11 11:24:10.000000000 -0500
    344 @@ -58,6 +58,10 @@
    345  #include "qurlinfo.h"
    346  #endif // QT_H
    347  
    348 +#if __GNUC__ - 0 > 3
    349 +#pragma GCC system_header
    350 +#endif
    351 +
    352  #ifndef QT_NO_FILEDIALOG
    353  
    354  class Q_EXPORT QFileIconProvider : public QObject
    355 --- qt-x11-free-3.3.5/src/kernel/qasyncimageio.h        2005-09-02 08:43:05.000000000 -0400
    356 +++ qt-x11-free-3.3.5-new/src/kernel/qasyncimageio.h    2006-02-11 11:24:10.000000000 -0500
    357 @@ -44,6 +44,9 @@
    358  
    359  #ifndef QT_NO_ASYNC_IMAGE_IO
    360  
    361 +#if __GNUC__ - 0 > 3
    362 +#pragma GCC system_header
    363 +#endif
    364  
    365  class Q_EXPORT QImageConsumer {
    366  public:
    367 --- qt-x11-free-3.3.5/src/kernel/qimageformatinterface_p.h      2005-09-02 08:43:04.000000000 -0400
    368 +++ qt-x11-free-3.3.5-new/src/kernel/qimageformatinterface_p.h  2006-02-11 11:24:10.000000000 -0500
    369 @@ -40,6 +40,9 @@
    370  #include <private/qcom_p.h>
    371  #endif // QT_H
    372  
    373 +#if __GNUC__ - 0 > 3
    374 +#pragma GCC system_header
    375 +#endif
    376  
    377  //
    378  //  W A R N I N G
    379 --- qt-x11-free-3.3.5/src/kernel/qnetworkprotocol.h     2005-09-02 08:43:05.000000000 -0400
    380 +++ qt-x11-free-3.3.5-new/src/kernel/qnetworkprotocol.h 2006-02-11 11:24:10.000000000 -0500
    381 @@ -47,6 +47,10 @@
    382  
    383  #ifndef QT_NO_NETWORKPROTOCOL
    384  
    385 +#if __GNUC__ - 0 > 3
    386 +#pragma GCC system_header
    387 +#endif
    388 +
    389  class QNetworkProtocol;
    390  class QNetworkOperation;
    391  class QTimer;
    392 --- qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp      2005-09-02 08:43:01.000000000 -0400
    393 +++ qt-x11-free-3.3.5-new/src/kernel/qprocess_unix.cpp  2006-02-11 11:24:10.000000000 -0500
     250diff -uNr qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp
     251--- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp      2006-03-08 11:47:45.000000000 -0500
     252+++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp  2006-03-15 21:47:34.000000000 -0500
    394253@@ -761,7 +761,7 @@
    395254 #endif
    … …  
    428287 #else
    429288                            arglistQ[0] = fileInfo.filePath().local8Bit();
    430 --- qt-x11-free-3.3.5/src/kernel/qucomextra_p.h 2005-09-02 08:43:01.000000000 -0400
    431 +++ qt-x11-free-3.3.5-new/src/kernel/qucomextra_p.h     2006-02-11 11:24:10.000000000 -0500
    432 @@ -54,6 +54,9 @@
    433  #include <private/qucom_p.h>
    434  #endif // QT_H
    435  
    436 +#if __GNUC__ - 0 > 3
    437 +#pragma GCC system_header
    438 +#endif
    439  
    440  class QVariant;
    441  
    442 --- qt-x11-free-3.3.5/src/moc/moc.pro   2003-10-31 09:36:28.000000000 -0500
    443 +++ qt-x11-free-3.3.5-new/src/moc/moc.pro       2006-02-11 11:24:10.000000000 -0500
     289diff -uNr qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp
     290--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp        2006-03-08 11:47:47.000000000 -0500
     291+++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp    2006-03-15 21:47:34.000000000 -0500
     292@@ -2671,6 +2671,9 @@
     293 
     294 void QWidget::createInputContext()
     295 {
     296+    if( !isInputMethodEnabled() || QApplication::closingDown() )
     297+       return;
     298+
     299     QWidget *tlw = topLevelWidget();
     300     QTLWExtra *topdata = tlw->topData();
     301 
     302diff -uNr qt-x11-free-3.3.6/src/moc/moc.pro qt-x11-free-3.3.6-new/src/moc/moc.pro
     303--- qt-x11-free-3.3.6/src/moc/moc.pro   2003-10-31 09:36:28.000000000 -0500
     304+++ qt-x11-free-3.3.6-new/src/moc/moc.pro       2006-03-15 21:47:34.000000000 -0500
    444305@@ -48,6 +48,8 @@
    445306 unix:SOURCES   += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
    … …  
    451312 target.path=$$bins.path
    452313 INSTALLS += target
    453 --- qt-x11-free-3.3.5/src/network/qdns.cpp      2005-09-02 08:42:59.000000000 -0400
    454 +++ qt-x11-free-3.3.5-new/src/network/qdns.cpp  2006-02-11 11:24:10.000000000 -0500
     314diff -uNr qt-x11-free-3.3.6/src/network/qdns.cpp qt-x11-free-3.3.6-new/src/network/qdns.cpp
     315--- qt-x11-free-3.3.6/src/network/qdns.cpp      2006-03-08 11:47:43.000000000 -0500
     316+++ qt-x11-free-3.3.6-new/src/network/qdns.cpp  2006-03-15 21:47:34.000000000 -0500
    455317@@ -76,7 +76,7 @@
    456318 #include "qcleanuphandler.h"
    … …  
    462324 
    463325 //#define QDNS_DEBUG
    464 --- qt-x11-free-3.3.5/src/qt_professional.pri   2004-02-06 07:08:19.000000000 -0500
    465 +++ qt-x11-free-3.3.5-new/src/qt_professional.pri       2006-02-11 11:24:10.000000000 -0500
     326diff -uNr qt-x11-free-3.3.6/src/qt_professional.pri qt-x11-free-3.3.6-new/src/qt_professional.pri
     327--- qt-x11-free-3.3.6/src/qt_professional.pri   2004-02-06 07:08:19.000000000 -0500
     328+++ qt-x11-free-3.3.6-new/src/qt_professional.pri       2006-03-15 21:47:34.000000000 -0500
    466329@@ -25,7 +25,6 @@
    467330        unix {
    … …  
    472335        include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
    473336        DEFINES     *= QT_MODULE_NETWORK
    474 --- qt-x11-free-3.3.5/src/qtmain.pro    2003-10-31 09:36:28.000000000 -0500
    475 +++ qt-x11-free-3.3.5-new/src/qtmain.pro        2006-02-11 11:24:10.000000000 -0500
     337diff -uNr qt-x11-free-3.3.6/src/qtmain.pro qt-x11-free-3.3.6-new/src/qtmain.pro
     338--- qt-x11-free-3.3.6/src/qtmain.pro    2003-10-31 09:36:28.000000000 -0500
     339+++ qt-x11-free-3.3.6-new/src/qtmain.pro        2006-03-15 21:47:34.000000000 -0500
    476340@@ -2,6 +2,7 @@
    477341 TEMPLATE = lib
    … …  
    482346 
    483347 CONFIG += qt staticlib warn_on release
    484 --- qt-x11-free-3.3.5/src/tools/qcom_p.h        2005-09-02 08:42:53.000000000 -0400
    485 +++ qt-x11-free-3.3.5-new/src/tools/qcom_p.h    2006-02-11 11:24:10.000000000 -0500
    486 @@ -53,6 +53,10 @@
    487  #include "quuid.h"
    488  #endif // QT_H
    489  
    490 +#if __GNUC__ - 0 > 3
    491 +#pragma GCC system_header
    492 +#endif
    493 +
    494  #ifndef QT_NO_COMPONENT
    495  
    496  class QObject;
    497 --- qt-x11-free-3.3.5/src/tools/qdir_unix.cpp   2005-09-02 08:42:54.000000000 -0400
    498 +++ qt-x11-free-3.3.5-new/src/tools/qdir_unix.cpp       2006-02-11 11:24:10.000000000 -0500
     348diff -uNr qt-x11-free-3.3.6/src/tools/qdir_unix.cpp qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp
     349--- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp   2006-03-08 11:47:38.000000000 -0500
     350+++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp       2006-03-15 21:47:34.000000000 -0500
    499351@@ -88,7 +88,7 @@
    500352 
    … …  
    506358     if (dirName[dirName.length() - 1] == "/")
    507359        name = dirName.left( dirName.length() - 1 );
    508 --- qt-x11-free-3.3.5/src/tools/qglobal.cpp     2005-09-02 08:42:55.000000000 -0400
    509 +++ qt-x11-free-3.3.5-new/src/tools/qglobal.cpp 2006-02-11 11:24:10.000000000 -0500
     360diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.cpp qt-x11-free-3.3.6-new/src/tools/qglobal.cpp
     361--- qt-x11-free-3.3.6/src/tools/qglobal.cpp     2006-03-08 11:47:40.000000000 -0500
     362+++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-15 21:47:34.000000000 -0500
    510363@@ -161,7 +161,7 @@
    511364     return TRUE;
    … …  
    517370 #include "qt_mac.h"
    518371 
    519 --- qt-x11-free-3.3.5/src/tools/qglobal.h       2005-09-02 08:42:53.000000000 -0400
    520 +++ qt-x11-free-3.3.5-new/src/tools/qglobal.h   2006-02-11 11:36:55.000000000 -0500
     372diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.h qt-x11-free-3.3.6-new/src/tools/qglobal.h
     373--- qt-x11-free-3.3.6/src/tools/qglobal.h       2006-03-08 11:47:38.000000000 -0500
     374+++ qt-x11-free-3.3.6-new/src/tools/qglobal.h   2006-03-15 21:47:34.000000000 -0500
    521375@@ -44,6 +44,10 @@
    522376  */
    523  #define QT_VERSION 0x030305
     377 #define QT_VERSION 0x030306
    524378 
    525379+#ifndef __DARWIN_X11__
    … …  
    530384    The operating system, must be one of: (Q_OS_x)
    531385 
    532 @@ -545,6 +549,8 @@
     386@@ -562,6 +566,8 @@
    533387 
    534388 #if defined(Q_OS_MAC9)
    … …  
    539393 #  define Q_WS_WIN16
    540394 #  error "Qt requires Win32 and does not work with Windows 3.x"
    541 @@ -865,6 +871,10 @@
     395@@ -882,6 +888,10 @@
    542396 #    define Q_TEMPLATE_EXTERN
    543397 #    undef  Q_DISABLE_COPY     /* avoid unresolved externals */
    … …  
    550404 #  undef QT_MAKEDLL            /* ignore these for other platforms */
    551405 #  undef QT_DLL
    552 --- qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp     2005-09-02 08:42:53.000000000 -0400
    553 +++ qt-x11-free-3.3.5-new/src/tools/qgpluginmanager.cpp 2006-02-11 11:24:10.000000000 -0500
     406diff -uNr qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp
     407--- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp     2006-03-08 11:47:38.000000000 -0500
     408+++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-15 21:47:34.000000000 -0500
    554409@@ -316,7 +316,7 @@
    555410 
    … …  
    561416 #elif defined(Q_OS_HPUX)
    562417     QString filter = "*.sl";
    563 --- qt-x11-free-3.3.5/src/tools/qlibrary.cpp    2005-09-02 08:42:53.000000000 -0400
    564 +++ qt-x11-free-3.3.5-new/src/tools/qlibrary.cpp        2006-02-11 11:24:10.000000000 -0500
     418diff -uNr qt-x11-free-3.3.6/src/tools/qlibrary.cpp qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp
     419--- qt-x11-free-3.3.6/src/tools/qlibrary.cpp    2006-03-08 11:47:37.000000000 -0500
     420+++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp        2006-03-15 21:47:34.000000000 -0500
    565421@@ -400,7 +400,7 @@
    566422        filename += ".dll";
    … …  
    572428     filters << ".bundle";
    573429     filters << ".dylib"; //the last one is also the default one..
    574 --- qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp 2005-09-02 08:42:53.000000000 -0400
    575 +++ qt-x11-free-3.3.5-new/src/tools/qmutex_unix.cpp     2006-02-11 11:24:10.000000000 -0500
     430diff -uNr qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp
     431--- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp 2006-03-08 11:47:37.000000000 -0500
     432+++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp     2006-03-15 21:47:34.000000000 -0500
    576433@@ -44,7 +44,7 @@
    577434 // POSIX threads mutex types
    … …  
    583440 #  define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
    584441 #  if defined(QT_CHECK_RANGE)
    585 --- qt-x11-free-3.3.5/src/tools/qstring.cpp     2005-09-02 08:42:54.000000000 -0400
    586 +++ qt-x11-free-3.3.5-new/src/tools/qstring.cpp 2006-02-11 11:24:10.000000000 -0500
     442diff -uNr qt-x11-free-3.3.6/src/tools/qstring.cpp qt-x11-free-3.3.6-new/src/tools/qstring.cpp
     443--- qt-x11-free-3.3.6/src/tools/qstring.cpp     2006-03-08 11:47:39.000000000 -0500
     444+++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-15 21:47:34.000000000 -0500
    587445@@ -1362,7 +1362,7 @@
    588446 QStringData* QString::makeSharedNull()
    … …  
    621479        return findRev( *str.unicode(), index, cs );
    622480 #endif
    623 --- qt-x11-free-3.3.5/src/tools/qt_tools.pri    2004-04-01 05:20:06.000000000 -0500
    624 +++ qt-x11-free-3.3.5-new/src/tools/qt_tools.pri        2006-02-11 11:24:10.000000000 -0500
     481diff -uNr qt-x11-free-3.3.6/src/tools/qt_tools.pri qt-x11-free-3.3.6-new/src/tools/qt_tools.pri
     482--- qt-x11-free-3.3.6/src/tools/qt_tools.pri    2004-04-01 05:20:06.000000000 -0500
     483+++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri        2006-03-15 21:47:34.000000000 -0500
    625484@@ -101,10 +101,6 @@
    626485                  $$TOOLS_CPP/qwaitcondition_unix.cpp
    … …  
    634493 
    635494        SOURCES += $$TOOLS_CPP/qbitarray.cpp \
    636 --- qt-x11-free-3.3.5/src/tools/qucom_p.h       2005-09-02 08:42:54.000000000 -0400
    637 +++ qt-x11-free-3.3.5-new/src/tools/qucom_p.h   2006-02-11 11:24:10.000000000 -0500
    638 @@ -59,6 +59,10 @@
    639  #undef check
    640  #endif
    641  
    642 +#if __GNUC__ - 0 > 3
    643 +#pragma GCC system_header
    644 +#endif
    645 +
    646  struct QUObject;
    647  struct QUInterfaceDescription;
    648  struct QUnknownInterface;
    649 --- qt-x11-free-3.3.5/src/widgets/qprogressbar.cpp      2005-09-02 08:43:14.000000000 -0400
    650 +++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.cpp  2006-02-11 11:24:11.000000000 -0500
     495diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp
     496--- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp      2006-03-08 11:47:58.000000000 -0500
     497+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp  2006-03-15 21:47:34.000000000 -0500
    651498@@ -105,7 +105,6 @@
    652499     initFrame();
    … …  
    678525 /*!
    679526     This method is called to generate the text displayed in the center
    680 --- qt-x11-free-3.3.5/src/widgets/qprogressbar.h        2005-09-02 08:43:14.000000000 -0400
    681 +++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.h    2006-02-11 11:24:11.000000000 -0500
     527diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.h qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h
     528--- qt-x11-free-3.3.6/src/widgets/qprogressbar.h        2006-03-08 11:47:58.000000000 -0500
     529+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h    2006-03-15 21:47:34.000000000 -0500
    682530@@ -61,6 +61,7 @@
    683531 public:
    … …  
    696544 private:
    697545     int                total_steps;
    698 --- qt-x11-free-3.3.5/src/widgets/qtooltip.h    2005-09-02 08:43:15.000000000 -0400
    699 +++ qt-x11-free-3.3.5-new/src/widgets/qtooltip.h        2006-02-11 11:24:10.000000000 -0500
    700 @@ -42,6 +42,9 @@
    701  
    702  #ifndef QT_NO_TOOLTIP
    703  
    704 +#if __GNUC__  - 0 > 3
    705 +#pragma GCC system_header
    706 +#endif
    707  
    708  class QTipManager;
    709  class QIconViewToolTip;
    710 --- qt-x11-free-3.3.5/tools/assistant/assistant.pro     2003-11-17 07:40:25.000000000 -0500
    711 +++ qt-x11-free-3.3.5-new/tools/assistant/assistant.pro 2006-02-11 11:24:10.000000000 -0500
     546diff -uNr qt-x11-free-3.3.6/tools/assistant/assistant.pro qt-x11-free-3.3.6-new/tools/assistant/assistant.pro
     547--- qt-x11-free-3.3.6/tools/assistant/assistant.pro     2003-11-17 07:40:25.000000000 -0500
     548+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-15 21:47:34.000000000 -0500
    712549@@ -32,6 +32,8 @@
    713550 
    … …  
    719556 target.path = $$bins.path
    720557 INSTALLS += target
    721 --- qt-x11-free-3.3.5/tools/designer/app/app.pro        2004-01-16 19:51:08.000000000 -0500
    722 +++ qt-x11-free-3.3.5-new/tools/designer/app/app.pro    2006-02-11 11:24:10.000000000 -0500
     558diff -uNr qt-x11-free-3.3.6/tools/designer/app/app.pro qt-x11-free-3.3.6-new/tools/designer/app/app.pro
     559--- qt-x11-free-3.3.6/tools/designer/app/app.pro        2004-01-16 19:51:08.000000000 -0500
     560+++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro    2006-03-15 21:47:34.000000000 -0500
    723561@@ -20,7 +20,8 @@
    724562    QMAKE_INFO_PLIST = Info_mac.plist
    … …  
    731569 target.path=$$bins.path
    732570 INSTALLS        += target
    733 --- qt-x11-free-3.3.5/tools/designer/designer/designer.pro      2004-07-29 09:09:50.000000000 -0400
    734 +++ qt-x11-free-3.3.5-new/tools/designer/designer/designer.pro  2006-02-11 11:24:10.000000000 -0500
     571diff -uNr qt-x11-free-3.3.6/tools/designer/designer/designer.pro qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro
     572--- qt-x11-free-3.3.6/tools/designer/designer/designer.pro      2006-02-15 10:48:20.000000000 -0500
     573+++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro  2006-03-15 21:47:34.000000000 -0500
    735574@@ -1,6 +1,6 @@
    736575 TEMPLATE       = lib
    … …  
    741580 !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
    742581    CONFIG          -= staticlib
    743 --- qt-x11-free-3.3.5/tools/designer/editor/editor.pro  2003-10-31 09:36:28.000000000 -0500
    744 +++ qt-x11-free-3.3.5-new/tools/designer/editor/editor.pro      2006-02-11 11:24:10.000000000 -0500
     582diff -uNr qt-x11-free-3.3.6/tools/designer/editor/editor.pro qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro
     583--- qt-x11-free-3.3.6/tools/designer/editor/editor.pro  2003-10-31 09:36:28.000000000 -0500
     584+++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro      2006-03-15 21:47:34.000000000 -0500
    745585@@ -1,5 +1,5 @@
    746586 TEMPLATE       = lib
    … …  
    750590 HEADERS                = editor.h  \
    751591                  parenmatcher.h  \
    752 --- qt-x11-free-3.3.5/tools/designer/uic/form.cpp       2005-08-31 06:13:47.000000000 -0400
    753 +++ qt-x11-free-3.3.5-new/tools/designer/uic/form.cpp   2006-02-11 11:24:11.000000000 -0500
     592diff -uNr qt-x11-free-3.3.6/tools/designer/uic/form.cpp qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp
     593--- qt-x11-free-3.3.6/tools/designer/uic/form.cpp       2005-08-31 06:13:47.000000000 -0400
     594+++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp   2006-03-15 21:47:34.000000000 -0500
    754595@@ -731,6 +731,13 @@
    755596             while ( !n2.isNull() ) {
    … …  
    766607                 }
    767608                 n2 = n2.nextSibling().toElement();
    768 --- qt-x11-free-3.3.5/tools/designer/uic/uic.pro        2003-10-31 09:36:28.000000000 -0500
    769 +++ qt-x11-free-3.3.5-new/tools/designer/uic/uic.pro    2006-02-11 11:24:11.000000000 -0500
     609diff -uNr qt-x11-free-3.3.6/tools/designer/uic/uic.pro qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro
     610--- qt-x11-free-3.3.6/tools/designer/uic/uic.pro        2003-10-31 09:36:28.000000000 -0500
     611+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro    2006-03-15 21:47:34.000000000 -0500
    770612@@ -40,3 +40,6 @@
    771613    LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
    … …  
    775617+CXXFLAGS += -mdynamic-no-pic
    776618+
    777 --- qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro      2003-10-31 09:36:28.000000000 -0500
    778 +++ qt-x11-free-3.3.5-new/tools/linguist/linguist/linguist.pro  2006-02-11 11:24:11.000000000 -0500
     619diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro
     620--- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro      2003-10-31 09:36:28.000000000 -0500
     621+++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro  2006-03-15 21:47:34.000000000 -0500
    779622@@ -43,6 +43,8 @@
    780623     staticlib:CONFIG -= global_init_link_order #yuck
    … …  
    786629 PROJECTNAME    = Qt Linguist
    787630 
    788 --- qt-x11-free-3.3.5/tools/linguist/linguist.pro       2004-06-08 04:06:56.000000000 -0400
    789 +++ qt-x11-free-3.3.5-new/tools/linguist/linguist.pro   2006-02-11 11:24:11.000000000 -0500
     631diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist.pro
     632--- qt-x11-free-3.3.6/tools/linguist/linguist.pro       2004-06-08 04:06:56.000000000 -0400
     633+++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro   2006-03-15 21:47:34.000000000 -0500
    790634@@ -1,8 +1,5 @@
    791635 TEMPLATE       = subdirs
    … …  
    797641                  lupdate \
    798642                  qm2ts
    799 --- qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro      2003-10-31 09:36:28.000000000 -0500
    800 +++ qt-x11-free-3.3.5-new/tools/linguist/lrelease/lrelease.pro  2006-02-11 11:24:11.000000000 -0500
     643diff -uNr qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro
     644--- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro      2003-10-31 09:36:28.000000000 -0500
     645+++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro  2006-03-15 21:47:34.000000000 -0500
    801646@@ -15,3 +15,6 @@
    802647 
    … …  
    806651+QMAKE_CFLAGS += -mdynamic-no-pic
    807652+QMAKE_CXXFLAGS += -mdynamic-no-pic
    808 --- qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro        2003-10-31 09:36:28.000000000 -0500
    809 +++ qt-x11-free-3.3.5-new/tools/linguist/lupdate/lupdate.pro    2006-02-11 11:24:11.000000000 -0500
     653diff -uNr qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro
     654--- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro        2003-10-31 09:36:28.000000000 -0500
     655+++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro    2006-03-15 21:47:34.000000000 -0500
    810656@@ -19,3 +19,7 @@
    811657 
    … …  
    816662+macx:CXXFLAGS += -mdynamic-no-pic
    817663+
    818 --- qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro    2003-10-31 09:36:28.000000000 -0500
    819 +++ qt-x11-free-3.3.5-new/tools/linguist/qm2ts/qm2ts.pro        2006-02-11 11:24:11.000000000 -0500
     664diff -uNr qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro
     665--- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro    2003-10-31 09:36:28.000000000 -0500
     666+++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro        2006-03-15 21:47:34.000000000 -0500
    820667@@ -13,3 +13,6 @@
    821668 
    … …  
    825672+CFLAGS += -mdynamic-no-pic
    826673+CXXFLAGS += -mdynamic-no-pic
    827 --- qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro       2005-07-19 20:59:24.000000000 -0400
    828 +++ qt-x11-free-3.3.5-new/tools/qtconfig/qtconfig.pro   2006-02-11 11:24:11.000000000 -0500
     674diff -uNr qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro
     675--- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro       2005-07-19 20:59:24.000000000 -0400
     676+++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro   2006-03-15 21:47:34.000000000 -0500
    829677@@ -15,4 +15,7 @@
    830678 INSTALLS       += target
    … …  
    835683+CXXFLAGS += -mdynamic-no-pic
    836684 REQUIRES=full-config nocrosscompiler !win32*
    837 --- qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp.orig   2006-03-02 00:21:49.000000000 -0500
    838 +++ qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp        2006-03-02 00:22:47.000000000 -0500
    839 @@ -2670,6 +2670,9 @@
    840  
    841  void QWidget::createInputContext()
    842  {
    843 +    if( !isInputMethodEnabled() || QApplication::closingDown() )
    844 +       return;
    845 +
    846      QWidget *tlw = topLevelWidget();
    847      QTLWExtra *topdata = tlw->topData();
    848  

  • trunk/dports/x11/qt3/files/qt3-tiger.patch

    r16914 r17153  
    1 --- qt-x11-free-3.3.5/Makefile  2005-01-03 11:08:00.000000000 -0500
    2 +++ qt-x11-free-3.3.5-new/Makefile      2006-02-11 11:24:10.000000000 -0500
     1diff -uNr qt-x11-free-3.3.6/Makefile qt-x11-free-3.3.6-new/Makefile
     2--- qt-x11-free-3.3.6/Makefile  2005-01-03 11:08:00.000000000 -0500
     3+++ qt-x11-free-3.3.6-new/Makefile      2006-03-15 21:47:34.000000000 -0500
    34@@ -11,7 +11,7 @@
    45 install: FORCE
    … …  
    1011        @echo "The Qt library is now built in ./lib"
    1112        @echo "The Qt examples are built in the directories in ./examples"
    12 --- qt-x11-free-3.3.5/configure 2005-08-22 05:31:26.000000000 -0400
    13 +++ qt-x11-free-3.3.5-new/configure     2006-02-11 11:24:11.000000000 -0500
     13diff -uNr qt-x11-free-3.3.6/configure qt-x11-free-3.3.6-new/configure
     14--- qt-x11-free-3.3.6/configure 2006-03-08 07:11:24.000000000 -0500
     15+++ qt-x11-free-3.3.6-new/configure     2006-03-15 21:50:20.000000000 -0500
    1416@@ -36,7 +36,7 @@
    1517 
    … …  
    2123 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
    2224 
    23 @@ -1046,8 +1046,8 @@
     25@@ -1051,8 +1051,8 @@
    2426 [ -z "$QT_INSTALL_DATA" ]         && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
    2527 # default PREFIX/translations
    … …  
    3234 # generate qconfig.cpp
    3335 [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
    34 @@ -3031,7 +3031,7 @@
     36@@ -3085,7 +3085,7 @@
    3537        COMPILER_VERSION="3.*"
    3638        ;;
    … …  
    4143     *)
    4244        ;;
    43 --- qt-x11-free-3.3.5/include/private/qcom_p.h  2005-09-02 08:42:53.000000000 -0400
    44 +++ qt-x11-free-3.3.5-new/include/private/qcom_p.h      2006-02-11 11:24:10.000000000 -0500
    45 @@ -53,6 +53,10 @@
    46  #include "quuid.h"
    47  #endif // QT_H
    48  
    49 +#if __GNUC__ - 0 > 3
    50 +#pragma GCC system_header
    51 +#endif
    52 +
    53  #ifndef QT_NO_COMPONENT
    54  
    55  class QObject;
    56 --- qt-x11-free-3.3.5/include/private/qimageformatinterface_p.h 2005-09-02 08:43:04.000000000 -0400
    57 +++ qt-x11-free-3.3.5-new/include/private/qimageformatinterface_p.h     2006-02-11 11:24:10.000000000 -0500
    58 @@ -40,6 +40,9 @@
    59  #include <private/qcom_p.h>
    60  #endif // QT_H
    61  
    62 +#if __GNUC__ - 0 > 3
    63 +#pragma GCC system_header
    64 +#endif
    65  
    66  //
    67  //  W A R N I N G
    68 --- qt-x11-free-3.3.5/include/private/qucom_p.h 2005-09-02 08:42:54.000000000 -0400
    69 +++ qt-x11-free-3.3.5-new/include/private/qucom_p.h     2006-02-11 11:24:10.000000000 -0500
    70 @@ -59,6 +59,10 @@
    71  #undef check
    72  #endif
    73  
    74 +#if __GNUC__ - 0 > 3
    75 +#pragma GCC system_header
    76 +#endif
    77 +
    78  struct QUObject;
    79  struct QUInterfaceDescription;
    80  struct QUnknownInterface;
    81 --- qt-x11-free-3.3.5/include/private/qucomextra_p.h    2005-09-02 08:43:01.000000000 -0400
    82 +++ qt-x11-free-3.3.5-new/include/private/qucomextra_p.h        2006-02-11 11:24:10.000000000 -0500
    83 @@ -54,6 +54,9 @@
    84  #include <private/qucom_p.h>
    85  #endif // QT_H
    86  
    87 +#if __GNUC__ - 0 > 3
    88 +#pragma GCC system_header
    89 +#endif
    90  
    91  class QVariant;
    92  
    93 --- qt-x11-free-3.3.5/include/qasyncimageio.h   2005-09-02 08:43:05.000000000 -0400
    94 +++ qt-x11-free-3.3.5-new/include/qasyncimageio.h       2006-02-11 11:24:10.000000000 -0500
    95 @@ -44,6 +44,9 @@
    96  
    97  #ifndef QT_NO_ASYNC_IMAGE_IO
    98  
    99 +#if __GNUC__ - 0 > 3
    100 +#pragma GCC system_header
    101 +#endif
    102  
    103  class Q_EXPORT QImageConsumer {
    104  public:
    105 --- qt-x11-free-3.3.5/include/qfiledialog.h     2005-09-02 08:42:52.000000000 -0400
    106 +++ qt-x11-free-3.3.5-new/include/qfiledialog.h 2006-02-11 11:24:10.000000000 -0500
    107 @@ -58,6 +58,10 @@
    108  #include "qurlinfo.h"
    109  #endif // QT_H
    110  
    111 +#if __GNUC__ - 0 > 3
    112 +#pragma GCC system_header
    113 +#endif
    114 +
    115  #ifndef QT_NO_FILEDIALOG
    116  
    117  class Q_EXPORT QFileIconProvider : public QObject
    118 --- qt-x11-free-3.3.5/include/qglobal.h 2005-09-02 08:42:53.000000000 -0400
    119 +++ qt-x11-free-3.3.5-new/include/qglobal.h     2006-02-11 11:36:55.000000000 -0500
     45diff -uNr qt-x11-free-3.3.6/include/qglobal.h qt-x11-free-3.3.6-new/include/qglobal.h
     46--- qt-x11-free-3.3.6/include/qglobal.h 2006-03-08 11:47:38.000000000 -0500
     47+++ qt-x11-free-3.3.6-new/include/qglobal.h     2006-03-15 21:47:34.000000000 -0500
    12048@@ -44,6 +44,10 @@
    12149  */
    122  #define QT_VERSION 0x030305
     50 #define QT_VERSION 0x030306
    12351 
    12452+#ifndef __DARWIN_X11__
    … …  
    12957    The operating system, must be one of: (Q_OS_x)
    13058 
    131 @@ -545,6 +549,8 @@
     59@@ -562,6 +566,8 @@
    13260 
    13361 #if defined(Q_OS_MAC9)
    … …  
    13866 #  define Q_WS_WIN16
    13967 #  error "Qt requires Win32 and does not work with Windows 3.x"
    140 @@ -865,6 +871,10 @@
     68@@ -882,6 +888,10 @@
    14169 #    define Q_TEMPLATE_EXTERN
    14270 #    undef  Q_DISABLE_COPY     /* avoid unresolved externals */
    … …  
    14977 #  undef QT_MAKEDLL            /* ignore these for other platforms */
    15078 #  undef QT_DLL
    151 --- qt-x11-free-3.3.5/include/qnetworkprotocol.h        2005-09-02 08:43:05.000000000 -0400
    152 +++ qt-x11-free-3.3.5-new/include/qnetworkprotocol.h    2006-02-11 11:24:10.000000000 -0500
    153 @@ -47,6 +47,10 @@
    154  
    155  #ifndef QT_NO_NETWORKPROTOCOL
    156  
    157 +#if __GNUC__ - 0 > 3
    158 +#pragma GCC system_header
    159 +#endif
    160 +
    161  class QNetworkProtocol;
    162  class QNetworkOperation;
    163  class QTimer;
    164 --- qt-x11-free-3.3.5/include/qprogressbar.h    2005-09-02 08:43:14.000000000 -0400
    165 +++ qt-x11-free-3.3.5-new/include/qprogressbar.h        2006-02-11 11:24:11.000000000 -0500
     79diff -uNr qt-x11-free-3.3.6/include/qprogressbar.h qt-x11-free-3.3.6-new/include/qprogressbar.h
     80--- qt-x11-free-3.3.6/include/qprogressbar.h    2006-03-08 11:47:58.000000000 -0500
     81+++ qt-x11-free-3.3.6-new/include/qprogressbar.h        2006-03-15 21:47:34.000000000 -0500
    16682@@ -61,6 +61,7 @@
    16783 public:
    … …  
    18096 private:
    18197     int                total_steps;
    182 --- qt-x11-free-3.3.5/include/qtooltip.h        2005-09-02 08:43:15.000000000 -0400
    183 +++ qt-x11-free-3.3.5-new/include/qtooltip.h    2006-02-11 11:24:10.000000000 -0500
    184 @@ -42,6 +42,9 @@
    185  
    186  #ifndef QT_NO_TOOLTIP
    187  
    188 +#if __GNUC__  - 0 > 3
    189 +#pragma GCC system_header
    190 +#endif
    191  
    192  class QTipManager;
    193  class QIconViewToolTip;
    194 --- qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf     2005-09-02 08:43:37.000000000 -0400
    195 +++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qmake.conf 2006-02-11 11:24:10.000000000 -0500
     98diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf
     99--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf     2006-03-08 11:48:20.000000000 -0500
     100+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf 2006-03-15 21:47:34.000000000 -0500
    196101@@ -9,19 +9,19 @@
    197102 MAKEFILE_GENERATOR     = UNIX
    … …  
    299204+QMAKE_CHK_DIR_EXISTS   = /bin/test -d
    300205+QMAKE_MKDIR            = /bin/mkdir -p
    301 --- qt-x11-free-3.3.5/mkspecs/darwin-g++/qplatformdefs.h        2003-05-27 11:19:20.000000000 -0400
    302 +++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qplatformdefs.h    2006-02-11 11:24:10.000000000 -0500
     206diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h
     207--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h        2003-05-27 11:19:20.000000000 -0400
     208+++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h    2006-03-15 21:47:34.000000000 -0500
    303209@@ -74,12 +74,13 @@
    304210 #define QT_SIGNAL_ARGS         int
    … …  
    316222 
    317223 #endif // QPLATFORMDEFS_H
    318 --- qt-x11-free-3.3.5/qmake/Makefile.unix       2004-09-13 14:24:42.000000000 -0400
    319 +++ qt-x11-free-3.3.5-new/qmake/Makefile.unix   2006-02-11 11:24:10.000000000 -0500
     224diff -uNr qt-x11-free-3.3.6/qmake/Makefile.unix qt-x11-free-3.3.6-new/qmake/Makefile.unix
     225--- qt-x11-free-3.3.6/qmake/Makefile.unix       2006-02-28 05:32:54.000000000 -0500
     226+++ qt-x11-free-3.3.6-new/qmake/Makefile.unix   2006-03-15 21:47:34.000000000 -0500
    320227@@ -36,8 +36,8 @@
    321228        -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
    … …  
    329236 qmake: $(OBJS) $(QOBJS)
    330237        $(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
    331 --- qt-x11-free-3.3.5/qmake/main.cpp    2005-09-02 08:43:19.000000000 -0400
    332 +++ qt-x11-free-3.3.5-new/qmake/main.cpp        2006-02-11 11:24:10.000000000 -0500
     238diff -uNr qt-x11-free-3.3.6/qmake/main.cpp qt-x11-free-3.3.6-new/qmake/main.cpp
     239--- qt-x11-free-3.3.6/qmake/main.cpp    2006-03-08 11:48:02.000000000 -0500
     240+++ qt-x11-free-3.3.6-new/qmake/main.cpp        2006-03-15 21:47:34.000000000 -0500
    333241@@ -49,7 +49,7 @@
    334242 
    … …  
    340248 bool qt_resolve_symlinks = FALSE;
    341249 #endif
    342 --- qt-x11-free-3.3.5/src/dialogs/qfiledialog.h 2005-09-02 08:42:52.000000000 -0400
    343 +++ qt-x11-free-3.3.5-new/src/dialogs/qfiledialog.h     2006-02-11 11:24:10.000000000 -0500
    344 @@ -58,6 +58,10 @@
    345  #include "qurlinfo.h"
    346  #endif // QT_H
    347  
    348 +#if __GNUC__ - 0 > 3
    349 +#pragma GCC system_header
    350 +#endif
    351 +
    352  #ifndef QT_NO_FILEDIALOG
    353  
    354  class Q_EXPORT QFileIconProvider : public QObject
    355 --- qt-x11-free-3.3.5/src/kernel/qasyncimageio.h        2005-09-02 08:43:05.000000000 -0400
    356 +++ qt-x11-free-3.3.5-new/src/kernel/qasyncimageio.h    2006-02-11 11:24:10.000000000 -0500
    357 @@ -44,6 +44,9 @@
    358  
    359  #ifndef QT_NO_ASYNC_IMAGE_IO
    360  
    361 +#if __GNUC__ - 0 > 3
    362 +#pragma GCC system_header
    363 +#endif
    364  
    365  class Q_EXPORT QImageConsumer {
    366  public:
    367 --- qt-x11-free-3.3.5/src/kernel/qimageformatinterface_p.h      2005-09-02 08:43:04.000000000 -0400
    368 +++ qt-x11-free-3.3.5-new/src/kernel/qimageformatinterface_p.h  2006-02-11 11:24:10.000000000 -0500
    369 @@ -40,6 +40,9 @@
    370  #include <private/qcom_p.h>
    371  #endif // QT_H
    372  
    373 +#if __GNUC__ - 0 > 3
    374 +#pragma GCC system_header
    375 +#endif
    376  
    377  //
    378  //  W A R N I N G
    379 --- qt-x11-free-3.3.5/src/kernel/qnetworkprotocol.h     2005-09-02 08:43:05.000000000 -0400
    380 +++ qt-x11-free-3.3.5-new/src/kernel/qnetworkprotocol.h 2006-02-11 11:24:10.000000000 -0500
    381 @@ -47,6 +47,10 @@
    382  
    383  #ifndef QT_NO_NETWORKPROTOCOL
    384  
    385 +#if __GNUC__ - 0 > 3
    386 +#pragma GCC system_header
    387 +#endif
    388 +
    389  class QNetworkProtocol;
    390  class QNetworkOperation;
    391  class QTimer;
    392 --- qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp      2005-09-02 08:43:01.000000000 -0400
    393 +++ qt-x11-free-3.3.5-new/src/kernel/qprocess_unix.cpp  2006-02-11 11:24:10.000000000 -0500
     250diff -uNr qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp
     251--- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp      2006-03-08 11:47:45.000000000 -0500
     252+++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp  2006-03-15 21:47:34.000000000 -0500
    394253@@ -761,7 +761,7 @@
    395254 #endif
    … …  
    428287 #else
    429288                            arglistQ[0] = fileInfo.filePath().local8Bit();
    430 --- qt-x11-free-3.3.5/src/kernel/qucomextra_p.h 2005-09-02 08:43:01.000000000 -0400
    431 +++ qt-x11-free-3.3.5-new/src/kernel/qucomextra_p.h     2006-02-11 11:24:10.000000000 -0500
    432 @@ -54,6 +54,9 @@
    433  #include <private/qucom_p.h>
    434  #endif // QT_H
    435  
    436 +#if __GNUC__ - 0 > 3
    437 +#pragma GCC system_header
    438 +#endif
    439  
    440  class QVariant;
    441  
    442 --- qt-x11-free-3.3.5/src/moc/moc.pro   2003-10-31 09:36:28.000000000 -0500
    443 +++ qt-x11-free-3.3.5-new/src/moc/moc.pro       2006-02-11 11:24:10.000000000 -0500
     289diff -uNr qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp
     290--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp        2006-03-08 11:47:47.000000000 -0500
     291+++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp    2006-03-15 21:47:34.000000000 -0500
     292@@ -2671,6 +2671,9 @@
     293 
     294 void QWidget::createInputContext()
     295 {
     296+    if( !isInputMethodEnabled() || QApplication::closingDown() )
     297+       return;
     298+
     299     QWidget *tlw = topLevelWidget();
     300     QTLWExtra *topdata = tlw->topData();
     301 
     302diff -uNr qt-x11-free-3.3.6/src/moc/moc.pro qt-x11-free-3.3.6-new/src/moc/moc.pro
     303--- qt-x11-free-3.3.6/src/moc/moc.pro   2003-10-31 09:36:28.000000000 -0500
     304+++ qt-x11-free-3.3.6-new/src/moc/moc.pro       2006-03-15 21:47:34.000000000 -0500
    444305@@ -48,6 +48,8 @@
    445306 unix:SOURCES   += ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
    … …  
    451312 target.path=$$bins.path
    452313 INSTALLS += target
    453 --- qt-x11-free-3.3.5/src/network/qdns.cpp      2005-09-02 08:42:59.000000000 -0400
    454 +++ qt-x11-free-3.3.5-new/src/network/qdns.cpp  2006-02-11 11:24:10.000000000 -0500
     314diff -uNr qt-x11-free-3.3.6/src/network/qdns.cpp qt-x11-free-3.3.6-new/src/network/qdns.cpp
     315--- qt-x11-free-3.3.6/src/network/qdns.cpp      2006-03-08 11:47:43.000000000 -0500
     316+++ qt-x11-free-3.3.6-new/src/network/qdns.cpp  2006-03-15 21:47:34.000000000 -0500
    455317@@ -76,7 +76,7 @@
    456318 #include "qcleanuphandler.h"
    … …  
    462324 
    463325 //#define QDNS_DEBUG
    464 --- qt-x11-free-3.3.5/src/qt_professional.pri   2004-02-06 07:08:19.000000000 -0500
    465 +++ qt-x11-free-3.3.5-new/src/qt_professional.pri       2006-02-11 11:24:10.000000000 -0500
     326diff -uNr qt-x11-free-3.3.6/src/qt_professional.pri qt-x11-free-3.3.6-new/src/qt_professional.pri
     327--- qt-x11-free-3.3.6/src/qt_professional.pri   2004-02-06 07:08:19.000000000 -0500
     328+++ qt-x11-free-3.3.6-new/src/qt_professional.pri       2006-03-15 21:47:34.000000000 -0500
    466329@@ -25,7 +25,6 @@
    467330        unix {
    … …  
    472335        include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
    473336        DEFINES     *= QT_MODULE_NETWORK
    474 --- qt-x11-free-3.3.5/src/qtmain.pro    2003-10-31 09:36:28.000000000 -0500
    475 +++ qt-x11-free-3.3.5-new/src/qtmain.pro        2006-02-11 11:24:10.000000000 -0500
     337diff -uNr qt-x11-free-3.3.6/src/qtmain.pro qt-x11-free-3.3.6-new/src/qtmain.pro
     338--- qt-x11-free-3.3.6/src/qtmain.pro    2003-10-31 09:36:28.000000000 -0500
     339+++ qt-x11-free-3.3.6-new/src/qtmain.pro        2006-03-15 21:47:34.000000000 -0500
    476340@@ -2,6 +2,7 @@
    477341 TEMPLATE = lib
    … …  
    482346 
    483347 CONFIG += qt staticlib warn_on release
    484 --- qt-x11-free-3.3.5/src/tools/qcom_p.h        2005-09-02 08:42:53.000000000 -0400
    485 +++ qt-x11-free-3.3.5-new/src/tools/qcom_p.h    2006-02-11 11:24:10.000000000 -0500
    486 @@ -53,6 +53,10 @@
    487  #include "quuid.h"
    488  #endif // QT_H
    489  
    490 +#if __GNUC__ - 0 > 3
    491 +#pragma GCC system_header
    492 +#endif
    493 +
    494  #ifndef QT_NO_COMPONENT
    495  
    496  class QObject;
    497 --- qt-x11-free-3.3.5/src/tools/qdir_unix.cpp   2005-09-02 08:42:54.000000000 -0400
    498 +++ qt-x11-free-3.3.5-new/src/tools/qdir_unix.cpp       2006-02-11 11:24:10.000000000 -0500
     348diff -uNr qt-x11-free-3.3.6/src/tools/qdir_unix.cpp qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp
     349--- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp   2006-03-08 11:47:38.000000000 -0500
     350+++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp       2006-03-15 21:47:34.000000000 -0500
    499351@@ -88,7 +88,7 @@
    500352 
    … …  
    506358     if (dirName[dirName.length() - 1] == "/")
    507359        name = dirName.left( dirName.length() - 1 );
    508 --- qt-x11-free-3.3.5/src/tools/qglobal.cpp     2005-09-02 08:42:55.000000000 -0400
    509 +++ qt-x11-free-3.3.5-new/src/tools/qglobal.cpp 2006-02-11 11:24:10.000000000 -0500
     360diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.cpp qt-x11-free-3.3.6-new/src/tools/qglobal.cpp
     361--- qt-x11-free-3.3.6/src/tools/qglobal.cpp     2006-03-08 11:47:40.000000000 -0500
     362+++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp 2006-03-15 21:47:34.000000000 -0500
    510363@@ -161,7 +161,7 @@
    511364     return TRUE;
    … …  
    517370 #include "qt_mac.h"
    518371 
    519 --- qt-x11-free-3.3.5/src/tools/qglobal.h       2005-09-02 08:42:53.000000000 -0400
    520 +++ qt-x11-free-3.3.5-new/src/tools/qglobal.h   2006-02-11 11:36:55.000000000 -0500
     372diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.h qt-x11-free-3.3.6-new/src/tools/qglobal.h
     373--- qt-x11-free-3.3.6/src/tools/qglobal.h       2006-03-08 11:47:38.000000000 -0500
     374+++ qt-x11-free-3.3.6-new/src/tools/qglobal.h   2006-03-15 21:47:34.000000000 -0500
    521375@@ -44,6 +44,10 @@
    522376  */
    523  #define QT_VERSION 0x030305
     377 #define QT_VERSION 0x030306
    524378 
    525379+#ifndef __DARWIN_X11__
    … …  
    530384    The operating system, must be one of: (Q_OS_x)
    531385 
    532 @@ -545,6 +549,8 @@
     386@@ -562,6 +566,8 @@
    533387 
    534388 #if defined(Q_OS_MAC9)
    … …  
    539393 #  define Q_WS_WIN16
    540394 #  error "Qt requires Win32 and does not work with Windows 3.x"
    541 @@ -865,6 +871,10 @@
     395@@ -882,6 +888,10 @@
    542396 #    define Q_TEMPLATE_EXTERN
    543397 #    undef  Q_DISABLE_COPY     /* avoid unresolved externals */
    … …  
    550404 #  undef QT_MAKEDLL            /* ignore these for other platforms */
    551405 #  undef QT_DLL
    552 --- qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp     2005-09-02 08:42:53.000000000 -0400
    553 +++ qt-x11-free-3.3.5-new/src/tools/qgpluginmanager.cpp 2006-02-11 11:24:10.000000000 -0500
     406diff -uNr qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp
     407--- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp     2006-03-08 11:47:38.000000000 -0500
     408+++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp 2006-03-15 21:47:34.000000000 -0500
    554409@@ -316,7 +316,7 @@
    555410 
    … …  
    561416 #elif defined(Q_OS_HPUX)
    562417     QString filter = "*.sl";
    563 --- qt-x11-free-3.3.5/src/tools/qlibrary.cpp    2005-09-02 08:42:53.000000000 -0400
    564 +++ qt-x11-free-3.3.5-new/src/tools/qlibrary.cpp        2006-02-11 11:24:10.000000000 -0500
     418diff -uNr qt-x11-free-3.3.6/src/tools/qlibrary.cpp qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp
     419--- qt-x11-free-3.3.6/src/tools/qlibrary.cpp    2006-03-08 11:47:37.000000000 -0500
     420+++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp        2006-03-15 21:47:34.000000000 -0500
    565421@@ -400,7 +400,7 @@
    566422        filename += ".dll";
    … …  
    572428     filters << ".bundle";
    573429     filters << ".dylib"; //the last one is also the default one..
    574 --- qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp 2005-09-02 08:42:53.000000000 -0400
    575 +++ qt-x11-free-3.3.5-new/src/tools/qmutex_unix.cpp     2006-02-11 11:24:10.000000000 -0500
     430diff -uNr qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp
     431--- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp 2006-03-08 11:47:37.000000000 -0500
     432+++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp     2006-03-15 21:47:34.000000000 -0500
    576433@@ -44,7 +44,7 @@
    577434 // POSIX threads mutex types
    … …  
    583440 #  define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
    584441 #  if defined(QT_CHECK_RANGE)
    585 --- qt-x11-free-3.3.5/src/tools/qstring.cpp     2005-09-02 08:42:54.000000000 -0400
    586 +++ qt-x11-free-3.3.5-new/src/tools/qstring.cpp 2006-02-11 11:24:10.000000000 -0500
     442diff -uNr qt-x11-free-3.3.6/src/tools/qstring.cpp qt-x11-free-3.3.6-new/src/tools/qstring.cpp
     443--- qt-x11-free-3.3.6/src/tools/qstring.cpp     2006-03-08 11:47:39.000000000 -0500
     444+++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp 2006-03-15 21:47:34.000000000 -0500
    587445@@ -1362,7 +1362,7 @@
    588446 QStringData* QString::makeSharedNull()
    … …  
    621479        return findRev( *str.unicode(), index, cs );
    622480 #endif
    623 --- qt-x11-free-3.3.5/src/tools/qt_tools.pri    2004-04-01 05:20:06.000000000 -0500
    624 +++ qt-x11-free-3.3.5-new/src/tools/qt_tools.pri        2006-02-11 11:24:10.000000000 -0500
     481diff -uNr qt-x11-free-3.3.6/src/tools/qt_tools.pri qt-x11-free-3.3.6-new/src/tools/qt_tools.pri
     482--- qt-x11-free-3.3.6/src/tools/qt_tools.pri    2004-04-01 05:20:06.000000000 -0500
     483+++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri        2006-03-15 21:47:34.000000000 -0500
    625484@@ -101,10 +101,6 @@
    626485                  $$TOOLS_CPP/qwaitcondition_unix.cpp
    … …  
    634493 
    635494        SOURCES += $$TOOLS_CPP/qbitarray.cpp \
    636 --- qt-x11-free-3.3.5/src/tools/qucom_p.h       2005-09-02 08:42:54.000000000 -0400
    637 +++ qt-x11-free-3.3.5-new/src/tools/qucom_p.h   2006-02-11 11:24:10.000000000 -0500
    638 @@ -59,6 +59,10 @@
    639  #undef check
    640  #endif
    641  
    642 +#if __GNUC__ - 0 > 3
    643 +#pragma GCC system_header
    644 +#endif
    645 +
    646  struct QUObject;
    647  struct QUInterfaceDescription;
    648  struct QUnknownInterface;
    649 --- qt-x11-free-3.3.5/src/widgets/qprogressbar.cpp      2005-09-02 08:43:14.000000000 -0400
    650 +++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.cpp  2006-02-11 11:24:11.000000000 -0500
     495diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp
     496--- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp      2006-03-08 11:47:58.000000000 -0500
     497+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp  2006-03-15 21:47:34.000000000 -0500
    651498@@ -105,7 +105,6 @@
    652499     initFrame();
    … …  
    678525 /*!
    679526     This method is called to generate the text displayed in the center
    680 --- qt-x11-free-3.3.5/src/widgets/qprogressbar.h        2005-09-02 08:43:14.000000000 -0400
    681 +++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.h    2006-02-11 11:24:11.000000000 -0500
     527diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.h qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h
     528--- qt-x11-free-3.3.6/src/widgets/qprogressbar.h        2006-03-08 11:47:58.000000000 -0500
     529+++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h    2006-03-15 21:47:34.000000000 -0500
    682530@@ -61,6 +61,7 @@
    683531 public:
    … …  
    696544 private:
    697545     int                total_steps;
    698 --- qt-x11-free-3.3.5/src/widgets/qtooltip.h    2005-09-02 08:43:15.000000000 -0400
    699 +++ qt-x11-free-3.3.5-new/src/widgets/qtooltip.h        2006-02-11 11:24:10.000000000 -0500
    700 @@ -42,6 +42,9 @@
    701  
    702  #ifndef QT_NO_TOOLTIP
    703  
    704 +#if __GNUC__  - 0 > 3
    705 +#pragma GCC system_header
    706 +#endif
    707  
    708  class QTipManager;
    709  class QIconViewToolTip;
    710 --- qt-x11-free-3.3.5/tools/assistant/assistant.pro     2003-11-17 07:40:25.000000000 -0500
    711 +++ qt-x11-free-3.3.5-new/tools/assistant/assistant.pro 2006-02-11 11:24:10.000000000 -0500
     546diff -uNr qt-x11-free-3.3.6/tools/assistant/assistant.pro qt-x11-free-3.3.6-new/tools/assistant/assistant.pro
     547--- qt-x11-free-3.3.6/tools/assistant/assistant.pro     2003-11-17 07:40:25.000000000 -0500
     548+++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro 2006-03-15 21:47:34.000000000 -0500
    712549@@ -32,6 +32,8 @@
    713550 
    … …  
    719556 target.path = $$bins.path
    720557 INSTALLS += target
    721 --- qt-x11-free-3.3.5/tools/designer/app/app.pro        2004-01-16 19:51:08.000000000 -0500
    722 +++ qt-x11-free-3.3.5-new/tools/designer/app/app.pro    2006-02-11 11:24:10.000000000 -0500
     558diff -uNr qt-x11-free-3.3.6/tools/designer/app/app.pro qt-x11-free-3.3.6-new/tools/designer/app/app.pro
     559--- qt-x11-free-3.3.6/tools/designer/app/app.pro        2004-01-16 19:51:08.000000000 -0500
     560+++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro    2006-03-15 21:47:34.000000000 -0500
    723561@@ -20,7 +20,8 @@
    724562    QMAKE_INFO_PLIST = Info_mac.plist
    … …  
    731569 target.path=$$bins.path
    732570 INSTALLS        += target
    733 --- qt-x11-free-3.3.5/tools/designer/designer/designer.pro      2004-07-29 09:09:50.000000000 -0400
    734 +++ qt-x11-free-3.3.5-new/tools/designer/designer/designer.pro  2006-02-11 11:24:10.000000000 -0500
     571diff -uNr qt-x11-free-3.3.6/tools/designer/designer/designer.pro qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro
     572--- qt-x11-free-3.3.6/tools/designer/designer/designer.pro      2006-02-15 10:48:20.000000000 -0500
     573+++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro  2006-03-15 21:47:34.000000000 -0500
    735574@@ -1,6 +1,6 @@
    736575 TEMPLATE       = lib
    … …  
    741580 !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
    742581    CONFIG          -= staticlib
    743 --- qt-x11-free-3.3.5/tools/designer/editor/editor.pro  2003-10-31 09:36:28.000000000 -0500
    744 +++ qt-x11-free-3.3.5-new/tools/designer/editor/editor.pro      2006-02-11 11:24:10.000000000 -0500
     582diff -uNr qt-x11-free-3.3.6/tools/designer/editor/editor.pro qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro
     583--- qt-x11-free-3.3.6/tools/designer/editor/editor.pro  2003-10-31 09:36:28.000000000 -0500
     584+++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro      2006-03-15 21:47:34.000000000 -0500
    745585@@ -1,5 +1,5 @@
    746586 TEMPLATE       = lib
    … …  
    750590 HEADERS                = editor.h  \
    751591                  parenmatcher.h  \
    752 --- qt-x11-free-3.3.5/tools/designer/uic/form.cpp       2005-08-31 06:13:47.000000000 -0400
    753 +++ qt-x11-free-3.3.5-new/tools/designer/uic/form.cpp   2006-02-11 11:24:11.000000000 -0500
     592diff -uNr qt-x11-free-3.3.6/tools/designer/uic/form.cpp qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp
     593--- qt-x11-free-3.3.6/tools/designer/uic/form.cpp       2005-08-31 06:13:47.000000000 -0400
     594+++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp   2006-03-15 21:47:34.000000000 -0500
    754595@@ -731,6 +731,13 @@
    755596             while ( !n2.isNull() ) {
    … …  
    766607                 }
    767608                 n2 = n2.nextSibling().toElement();
    768 --- qt-x11-free-3.3.5/tools/designer/uic/uic.pro        2003-10-31 09:36:28.000000000 -0500
    769 +++ qt-x11-free-3.3.5-new/tools/designer/uic/uic.pro    2006-02-11 11:24:11.000000000 -0500
     609diff -uNr qt-x11-free-3.3.6/tools/designer/uic/uic.pro qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro
     610--- qt-x11-free-3.3.6/tools/designer/uic/uic.pro        2003-10-31 09:36:28.000000000 -0500
     611+++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro    2006-03-15 21:47:34.000000000 -0500
    770612@@ -40,3 +40,6 @@
    771613    LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
    … …  
    775617+CXXFLAGS += -mdynamic-no-pic
    776618+
    777 --- qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro      2003-10-31 09:36:28.000000000 -0500
    778 +++ qt-x11-free-3.3.5-new/tools/linguist/linguist/linguist.pro  2006-02-11 11:24:11.000000000 -0500
     619diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro
     620--- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro      2003-10-31 09:36:28.000000000 -0500
     621+++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro  2006-03-15 21:47:34.000000000 -0500
    779622@@ -43,6 +43,8 @@
    780623     staticlib:CONFIG -= global_init_link_order #yuck
    … …  
    786629 PROJECTNAME    = Qt Linguist
    787630 
    788 --- qt-x11-free-3.3.5/tools/linguist/linguist.pro       2004-06-08 04:06:56.000000000 -0400
    789 +++ qt-x11-free-3.3.5-new/tools/linguist/linguist.pro   2006-02-11 11:24:11.000000000 -0500
     631diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist.pro
     632--- qt-x11-free-3.3.6/tools/linguist/linguist.pro       2004-06-08 04:06:56.000000000 -0400
     633+++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro   2006-03-15 21:47:34.000000000 -0500
    790634@@ -1,8 +1,5 @@
    791635 TEMPLATE       = subdirs
    … …  
    797641                  lupdate \
    798642                  qm2ts
    799 --- qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro      2003-10-31 09:36:28.000000000 -0500
    800 +++ qt-x11-free-3.3.5-new/tools/linguist/lrelease/lrelease.pro  2006-02-11 11:24:11.000000000 -0500
     643diff -uNr qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro
     644--- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro      2003-10-31 09:36:28.000000000 -0500
     645+++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro  2006-03-15 21:47:34.000000000 -0500
    801646@@ -15,3 +15,6 @@
    802647 
    … …  
    806651+QMAKE_CFLAGS += -mdynamic-no-pic
    807652+QMAKE_CXXFLAGS += -mdynamic-no-pic
    808 --- qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro        2003-10-31 09:36:28.000000000 -0500
    809 +++ qt-x11-free-3.3.5-new/tools/linguist/lupdate/lupdate.pro    2006-02-11 11:24:11.000000000 -0500
     653diff -uNr qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro
     654--- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro        2003-10-31 09:36:28.000000000 -0500
     655+++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro    2006-03-15 21:47:34.000000000 -0500
    810656@@ -19,3 +19,7 @@
    811657 
    … …  
    816662+macx:CXXFLAGS += -mdynamic-no-pic
    817663+
    818 --- qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro    2003-10-31 09:36:28.000000000 -0500
    819 +++ qt-x11-free-3.3.5-new/tools/linguist/qm2ts/qm2ts.pro        2006-02-11 11:24:11.000000000 -0500
     664diff -uNr qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro
     665--- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro    2003-10-31 09:36:28.000000000 -0500
     666+++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro        2006-03-15 21:47:34.000000000 -0500
    820667@@ -13,3 +13,6 @@
    821668 
    … …  
    825672+CFLAGS += -mdynamic-no-pic
    826673+CXXFLAGS += -mdynamic-no-pic
    827 --- qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro       2005-07-19 20:59:24.000000000 -0400
    828 +++ qt-x11-free-3.3.5-new/tools/qtconfig/qtconfig.pro   2006-02-11 11:24:11.000000000 -0500
     674diff -uNr qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro
     675--- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro       2005-07-19 20:59:24.000000000 -0400
     676+++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro   2006-03-15 21:47:34.000000000 -0500
    829677@@ -15,4 +15,7 @@
    830678 INSTALLS       += target
    … …  
    835683+CXXFLAGS += -mdynamic-no-pic
    836684 REQUIRES=full-config nocrosscompiler !win32*
    837 --- qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp.orig   2006-03-02 00:21:49.000000000 -0500
    838 +++ qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp        2006-03-02 00:22:47.000000000 -0500
    839 @@ -2670,6 +2670,9 @@
    840  
    841  void QWidget::createInputContext()
    842  {
    843 +    if( !isInputMethodEnabled() || QApplication::closingDown() )
    844 +       return;
    845 +
    846      QWidget *tlw = topLevelWidget();
    847      QTLWExtra *topdata = tlw->topData();
    848  
Note: See TracChangeset for help on using the changeset viewer.