Index: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	(revision 17152)
+++ trunk/dports/x11/qt3/Portfile	(revision 17153)
@@ -1,8 +1,7 @@
-# $Id: Portfile,v 1.45 2006/03/13 09:37:58 takanori Exp $
+# $Id: Portfile,v 1.46 2006/03/24 18:21:29 takanori Exp $
 
 PortSystem 1.0
 name		qt3
-version		3.3.5
-revision	1
+version		3.3.6
 categories	x11
 maintainers	ben@opendarwin.org takanori@opendarwin.org
@@ -28,5 +27,5 @@
 		port:zlib
 
-checksums	${distname}.tar.bz2 md5 05d04688c0c0230ed54e89102d689ca4 \
+checksums	${distname}.tar.bz2 md5 dc1384c03ac08af21f6fefab32d982cf \
 		qt-upstream-patches-0002.tar.bz2 md5 85bd46f2c4b820ae6b64271dae173b4b
 
@@ -89,14 +88,11 @@
 			    patches/0047-fix-kmenu-width.rr.diff \
 			    patches/0048-qclipboard_hack_80072.rr.patch \
-			    patches/0051-qtoolbar_77047.rr.patch \
 			    patches/0056-khotkeys_input_84434.rr.patch \
-			    patches/qt-x11-free-3.3.4-assistant_de.patch \
-			    patches/qt-x11-free-3.3.4-fullscreen.patch \
-			    patches/qt-x11-free-3.3.5-warning.patch } {
+			    patches/qt-x11-free-3.3.4-fullscreen.patch } {
 			    	system "cd ${worksrcpath} && patch -p1 --fuzz=4 < ${workpath}/${p}"
 		}
 }
 
-configure.env	DYLD_FALLBACK_LIBRARY_PATH='${worksrcpath}/lib:/usr/lib' \
+configure.env	DYLD_FALLBACK_LIBRARY_PATH='${worksrcpath}/lib:${worksrcpath}/lib/qt3-plugins/designer:${worksrcpath}/lib/qt3-plugins/imageformats:/usr/lib' \
 		INSTALL_ROOT='' \
 		QMAKESPEC='${worksrcpath}/mkspecs/darwin-g++' \
Index: trunk/dports/x11/qt3/files/qt3-panther.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-panther.patch	(revision 17152)
+++ trunk/dports/x11/qt3/files/qt3-panther.patch	(revision 17153)
@@ -1,4 +1,5 @@
---- qt-x11-free-3.3.5/Makefile	2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.5-new/Makefile	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/Makefile qt-x11-free-3.3.6-new/Makefile
+--- qt-x11-free-3.3.6/Makefile	2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.6-new/Makefile	2006-03-15 21:47:34.000000000 -0500
 @@ -11,7 +11,7 @@
  install: FORCE
@@ -10,6 +11,7 @@
  	@echo "The Qt library is now built in ./lib"
  	@echo "The Qt examples are built in the directories in ./examples"
---- qt-x11-free-3.3.5/configure	2005-08-22 05:31:26.000000000 -0400
-+++ qt-x11-free-3.3.5-new/configure	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/configure qt-x11-free-3.3.6-new/configure
+--- qt-x11-free-3.3.6/configure	2006-03-08 07:11:24.000000000 -0500
++++ qt-x11-free-3.3.6-new/configure	2006-03-15 21:50:20.000000000 -0500
 @@ -36,7 +36,7 @@
  
@@ -21,5 +23,5 @@
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
-@@ -1046,8 +1046,8 @@
+@@ -1051,8 +1051,8 @@
  [ -z "$QT_INSTALL_DATA" ]         && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
  # default PREFIX/translations
@@ -32,5 +34,5 @@
  # generate qconfig.cpp
  [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
-@@ -3031,7 +3031,7 @@
+@@ -3085,7 +3085,7 @@
  	COMPILER_VERSION="3.*"
  	;;
@@ -41,84 +43,10 @@
      *)
  	;;
---- qt-x11-free-3.3.5/include/private/qcom_p.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qcom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -53,6 +53,10 @@
- #include "quuid.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_COMPONENT
- 
- class QObject;
---- qt-x11-free-3.3.5/include/private/qimageformatinterface_p.h	2005-09-02 08:43:04.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qimageformatinterface_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -40,6 +40,9 @@
- #include <private/qcom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- //
- //  W A R N I N G
---- qt-x11-free-3.3.5/include/private/qucom_p.h	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qucom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -59,6 +59,10 @@
- #undef check
- #endif
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- struct QUObject;
- struct QUInterfaceDescription;
- struct QUnknownInterface;
---- qt-x11-free-3.3.5/include/private/qucomextra_p.h	2005-09-02 08:43:01.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qucomextra_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -54,6 +54,9 @@
- #include <private/qucom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QVariant;
- 
---- qt-x11-free-3.3.5/include/qasyncimageio.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qasyncimageio.h	2006-02-11 11:24:10.000000000 -0500
-@@ -44,6 +44,9 @@
- 
- #ifndef QT_NO_ASYNC_IMAGE_IO
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class Q_EXPORT QImageConsumer {
- public:
---- qt-x11-free-3.3.5/include/qfiledialog.h	2005-09-02 08:42:52.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qfiledialog.h	2006-02-11 11:24:10.000000000 -0500
-@@ -58,6 +58,10 @@
- #include "qurlinfo.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_FILEDIALOG
- 
- class Q_EXPORT QFileIconProvider : public QObject
---- qt-x11-free-3.3.5/include/qglobal.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qglobal.h	2006-02-11 11:36:55.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/include/qglobal.h qt-x11-free-3.3.6-new/include/qglobal.h
+--- qt-x11-free-3.3.6/include/qglobal.h	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/include/qglobal.h	2006-03-15 21:47:34.000000000 -0500
 @@ -44,6 +44,10 @@
   */
- #define QT_VERSION 0x030305
+ #define QT_VERSION 0x030306
  
 +#ifndef __DARWIN_X11__
@@ -129,5 +57,5 @@
     The operating system, must be one of: (Q_OS_x)
  
-@@ -545,6 +549,8 @@
+@@ -562,6 +566,8 @@
  
  #if defined(Q_OS_MAC9)
@@ -138,5 +66,5 @@
  #  define Q_WS_WIN16
  #  error "Qt requires Win32 and does not work with Windows 3.x"
-@@ -865,6 +871,10 @@
+@@ -882,6 +888,10 @@
  #    define Q_TEMPLATE_EXTERN
  #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
@@ -149,19 +77,7 @@
  #  undef QT_MAKEDLL		/* ignore these for other platforms */
  #  undef QT_DLL
---- qt-x11-free-3.3.5/include/qnetworkprotocol.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qnetworkprotocol.h	2006-02-11 11:24:10.000000000 -0500
-@@ -47,6 +47,10 @@
- 
- #ifndef QT_NO_NETWORKPROTOCOL
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- class QNetworkProtocol;
- class QNetworkOperation;
- class QTimer;
---- qt-x11-free-3.3.5/include/qprogressbar.h	2005-09-02 08:43:14.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qprogressbar.h	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/include/qprogressbar.h qt-x11-free-3.3.6-new/include/qprogressbar.h
+--- qt-x11-free-3.3.6/include/qprogressbar.h	2006-03-08 11:47:58.000000000 -0500
++++ qt-x11-free-3.3.6-new/include/qprogressbar.h	2006-03-15 21:47:34.000000000 -0500
 @@ -61,6 +61,7 @@
  public:
@@ -180,18 +96,7 @@
  private:
      int		total_steps;
---- qt-x11-free-3.3.5/include/qtooltip.h	2005-09-02 08:43:15.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qtooltip.h	2006-02-11 11:24:10.000000000 -0500
-@@ -42,6 +42,9 @@
- 
- #ifndef QT_NO_TOOLTIP
- 
-+#if __GNUC__  - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QTipManager;
- class QIconViewToolTip;
---- qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf	2005-09-02 08:43:37.000000000 -0400
-+++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qmake.conf	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf
+--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf	2006-03-08 11:48:20.000000000 -0500
++++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf	2006-03-15 21:47:34.000000000 -0500
 @@ -9,19 +9,19 @@
  MAKEFILE_GENERATOR	= UNIX
@@ -299,6 +204,7 @@
 +QMAKE_CHK_DIR_EXISTS	= /bin/test -d
 +QMAKE_MKDIR		= /bin/mkdir -p
---- qt-x11-free-3.3.5/mkspecs/darwin-g++/qplatformdefs.h	2003-05-27 11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qplatformdefs.h	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h
+--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h	2003-05-27 11:19:20.000000000 -0400
++++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h	2006-03-15 21:47:34.000000000 -0500
 @@ -74,12 +74,13 @@
  #define QT_SIGNAL_ARGS		int
@@ -316,6 +222,7 @@
  
  #endif // QPLATFORMDEFS_H
---- qt-x11-free-3.3.5/qmake/Makefile.unix	2004-09-13 14:24:42.000000000 -0400
-+++ qt-x11-free-3.3.5-new/qmake/Makefile.unix	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/qmake/Makefile.unix qt-x11-free-3.3.6-new/qmake/Makefile.unix
+--- qt-x11-free-3.3.6/qmake/Makefile.unix	2006-02-28 05:32:54.000000000 -0500
++++ qt-x11-free-3.3.6-new/qmake/Makefile.unix	2006-03-15 21:47:34.000000000 -0500
 @@ -36,8 +36,8 @@
  	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
@@ -329,6 +236,7 @@
  qmake: $(OBJS) $(QOBJS)
  	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- qt-x11-free-3.3.5/qmake/main.cpp	2005-09-02 08:43:19.000000000 -0400
-+++ qt-x11-free-3.3.5-new/qmake/main.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/qmake/main.cpp qt-x11-free-3.3.6-new/qmake/main.cpp
+--- qt-x11-free-3.3.6/qmake/main.cpp	2006-03-08 11:48:02.000000000 -0500
++++ qt-x11-free-3.3.6-new/qmake/main.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -49,7 +49,7 @@
  
@@ -340,56 +248,7 @@
  bool qt_resolve_symlinks = FALSE;
  #endif
---- qt-x11-free-3.3.5/src/dialogs/qfiledialog.h	2005-09-02 08:42:52.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/dialogs/qfiledialog.h	2006-02-11 11:24:10.000000000 -0500
-@@ -58,6 +58,10 @@
- #include "qurlinfo.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_FILEDIALOG
- 
- class Q_EXPORT QFileIconProvider : public QObject
---- qt-x11-free-3.3.5/src/kernel/qasyncimageio.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qasyncimageio.h	2006-02-11 11:24:10.000000000 -0500
-@@ -44,6 +44,9 @@
- 
- #ifndef QT_NO_ASYNC_IMAGE_IO
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class Q_EXPORT QImageConsumer {
- public:
---- qt-x11-free-3.3.5/src/kernel/qimageformatinterface_p.h	2005-09-02 08:43:04.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qimageformatinterface_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -40,6 +40,9 @@
- #include <private/qcom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- //
- //  W A R N I N G
---- qt-x11-free-3.3.5/src/kernel/qnetworkprotocol.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qnetworkprotocol.h	2006-02-11 11:24:10.000000000 -0500
-@@ -47,6 +47,10 @@
- 
- #ifndef QT_NO_NETWORKPROTOCOL
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- class QNetworkProtocol;
- class QNetworkOperation;
- class QTimer;
---- qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp	2005-09-02 08:43:01.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qprocess_unix.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp
+--- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp	2006-03-08 11:47:45.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -761,7 +761,7 @@
  #endif
@@ -428,18 +287,20 @@
  #else
  			    arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.5/src/kernel/qucomextra_p.h	2005-09-02 08:43:01.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qucomextra_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -54,6 +54,9 @@
- #include <private/qucom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QVariant;
- 
---- qt-x11-free-3.3.5/src/moc/moc.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/moc/moc.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp
+--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp	2006-03-08 11:47:47.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp	2006-03-15 21:47:34.000000000 -0500
+@@ -2671,6 +2671,9 @@
+ 
+ void QWidget::createInputContext()
+ {
++    if( !isInputMethodEnabled() || QApplication::closingDown() )
++	return;
++
+     QWidget *tlw = topLevelWidget();
+     QTLWExtra *topdata = tlw->topData();
+ 
+diff -uNr qt-x11-free-3.3.6/src/moc/moc.pro qt-x11-free-3.3.6-new/src/moc/moc.pro
+--- qt-x11-free-3.3.6/src/moc/moc.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/moc/moc.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -48,6 +48,8 @@
  unix:SOURCES	+= ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
@@ -451,6 +312,7 @@
  target.path=$$bins.path
  INSTALLS += target
---- qt-x11-free-3.3.5/src/network/qdns.cpp	2005-09-02 08:42:59.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/network/qdns.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/network/qdns.cpp qt-x11-free-3.3.6-new/src/network/qdns.cpp
+--- qt-x11-free-3.3.6/src/network/qdns.cpp	2006-03-08 11:47:43.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/network/qdns.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -76,7 +76,7 @@
  #include "qcleanuphandler.h"
@@ -462,6 +324,7 @@
  
  //#define QDNS_DEBUG
---- qt-x11-free-3.3.5/src/qt_professional.pri	2004-02-06 07:08:19.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/qt_professional.pri	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/qt_professional.pri qt-x11-free-3.3.6-new/src/qt_professional.pri
+--- qt-x11-free-3.3.6/src/qt_professional.pri	2004-02-06 07:08:19.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/qt_professional.pri	2006-03-15 21:47:34.000000000 -0500
 @@ -25,7 +25,6 @@
  	unix {
@@ -472,6 +335,7 @@
  	include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
  	DEFINES     *= QT_MODULE_NETWORK
---- qt-x11-free-3.3.5/src/qtmain.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/qtmain.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/qtmain.pro qt-x11-free-3.3.6-new/src/qtmain.pro
+--- qt-x11-free-3.3.6/src/qtmain.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/qtmain.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -2,6 +2,7 @@
  TEMPLATE = lib
@@ -482,19 +346,7 @@
  
  CONFIG	+= qt staticlib warn_on release
---- qt-x11-free-3.3.5/src/tools/qcom_p.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qcom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -53,6 +53,10 @@
- #include "quuid.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_COMPONENT
- 
- class QObject;
---- qt-x11-free-3.3.5/src/tools/qdir_unix.cpp	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qdir_unix.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qdir_unix.cpp qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp
+--- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -88,7 +88,7 @@
  
@@ -506,6 +358,7 @@
      if (dirName[dirName.length() - 1] == "/")
  	name = dirName.left( dirName.length() - 1 );
---- qt-x11-free-3.3.5/src/tools/qglobal.cpp	2005-09-02 08:42:55.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qglobal.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.cpp qt-x11-free-3.3.6-new/src/tools/qglobal.cpp
+--- qt-x11-free-3.3.6/src/tools/qglobal.cpp	2006-03-08 11:47:40.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -161,7 +161,7 @@
      return TRUE;
@@ -517,9 +370,10 @@
  #include "qt_mac.h"
  
---- qt-x11-free-3.3.5/src/tools/qglobal.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qglobal.h	2006-02-11 11:36:55.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.h qt-x11-free-3.3.6-new/src/tools/qglobal.h
+--- qt-x11-free-3.3.6/src/tools/qglobal.h	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qglobal.h	2006-03-15 21:47:34.000000000 -0500
 @@ -44,6 +44,10 @@
   */
- #define QT_VERSION 0x030305
+ #define QT_VERSION 0x030306
  
 +#ifndef __DARWIN_X11__
@@ -530,5 +384,5 @@
     The operating system, must be one of: (Q_OS_x)
  
-@@ -545,6 +549,8 @@
+@@ -562,6 +566,8 @@
  
  #if defined(Q_OS_MAC9)
@@ -539,5 +393,5 @@
  #  define Q_WS_WIN16
  #  error "Qt requires Win32 and does not work with Windows 3.x"
-@@ -865,6 +871,10 @@
+@@ -882,6 +888,10 @@
  #    define Q_TEMPLATE_EXTERN
  #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
@@ -550,6 +404,7 @@
  #  undef QT_MAKEDLL		/* ignore these for other platforms */
  #  undef QT_DLL
---- qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qgpluginmanager.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp
+--- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -316,7 +316,7 @@
  
@@ -561,6 +416,7 @@
  #elif defined(Q_OS_HPUX)
      QString filter = "*.sl";
---- qt-x11-free-3.3.5/src/tools/qlibrary.cpp	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qlibrary.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qlibrary.cpp qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp
+--- qt-x11-free-3.3.6/src/tools/qlibrary.cpp	2006-03-08 11:47:37.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -400,7 +400,7 @@
  	filename += ".dll";
@@ -572,6 +428,7 @@
      filters << ".bundle";
      filters << ".dylib"; //the last one is also the default one..
---- qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qmutex_unix.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp
+--- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp	2006-03-08 11:47:37.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -44,7 +44,7 @@
  // POSIX threads mutex types
@@ -583,6 +440,7 @@
  #  define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
  #  if defined(QT_CHECK_RANGE)
---- qt-x11-free-3.3.5/src/tools/qstring.cpp	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qstring.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qstring.cpp qt-x11-free-3.3.6-new/src/tools/qstring.cpp
+--- qt-x11-free-3.3.6/src/tools/qstring.cpp	2006-03-08 11:47:39.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -1362,7 +1362,7 @@
  QStringData* QString::makeSharedNull()
@@ -621,6 +479,7 @@
  	return findRev( *str.unicode(), index, cs );
  #endif
---- qt-x11-free-3.3.5/src/tools/qt_tools.pri	2004-04-01 05:20:06.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/tools/qt_tools.pri	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qt_tools.pri qt-x11-free-3.3.6-new/src/tools/qt_tools.pri
+--- qt-x11-free-3.3.6/src/tools/qt_tools.pri	2004-04-01 05:20:06.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri	2006-03-15 21:47:34.000000000 -0500
 @@ -101,10 +101,6 @@
  		  $$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -634,19 +493,7 @@
  
  	SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.5/src/tools/qucom_p.h	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qucom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -59,6 +59,10 @@
- #undef check
- #endif
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- struct QUObject;
- struct QUInterfaceDescription;
- struct QUnknownInterface;
---- qt-x11-free-3.3.5/src/widgets/qprogressbar.cpp	2005-09-02 08:43:14.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.cpp	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp
+--- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp	2006-03-08 11:47:58.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -105,7 +105,6 @@
      initFrame();
@@ -678,6 +525,7 @@
  /*!
      This method is called to generate the text displayed in the center
---- qt-x11-free-3.3.5/src/widgets/qprogressbar.h	2005-09-02 08:43:14.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.h	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.h qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h
+--- qt-x11-free-3.3.6/src/widgets/qprogressbar.h	2006-03-08 11:47:58.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h	2006-03-15 21:47:34.000000000 -0500
 @@ -61,6 +61,7 @@
  public:
@@ -696,18 +544,7 @@
  private:
      int		total_steps;
---- qt-x11-free-3.3.5/src/widgets/qtooltip.h	2005-09-02 08:43:15.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/widgets/qtooltip.h	2006-02-11 11:24:10.000000000 -0500
-@@ -42,6 +42,9 @@
- 
- #ifndef QT_NO_TOOLTIP
- 
-+#if __GNUC__  - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QTipManager;
- class QIconViewToolTip;
---- qt-x11-free-3.3.5/tools/assistant/assistant.pro	2003-11-17 07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/assistant/assistant.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/assistant/assistant.pro qt-x11-free-3.3.6-new/tools/assistant/assistant.pro
+--- qt-x11-free-3.3.6/tools/assistant/assistant.pro	2003-11-17 07:40:25.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -32,6 +32,8 @@
  
@@ -719,6 +556,7 @@
  target.path = $$bins.path
  INSTALLS += target
---- qt-x11-free-3.3.5/tools/designer/app/app.pro	2004-01-16 19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/designer/app/app.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/app/app.pro qt-x11-free-3.3.6-new/tools/designer/app/app.pro
+--- qt-x11-free-3.3.6/tools/designer/app/app.pro	2004-01-16 19:51:08.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -20,7 +20,8 @@
     QMAKE_INFO_PLIST = Info_mac.plist
@@ -731,6 +569,7 @@
  target.path=$$bins.path
  INSTALLS        += target
---- qt-x11-free-3.3.5/tools/designer/designer/designer.pro	2004-07-29 09:09:50.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/designer/designer/designer.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/designer/designer.pro qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro
+--- qt-x11-free-3.3.6/tools/designer/designer/designer.pro	2006-02-15 10:48:20.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -1,6 +1,6 @@
  TEMPLATE	= lib
@@ -741,6 +580,7 @@
  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
     CONFIG          -= staticlib
---- qt-x11-free-3.3.5/tools/designer/editor/editor.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/designer/editor/editor.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/editor/editor.pro qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro
+--- qt-x11-free-3.3.6/tools/designer/editor/editor.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -1,5 +1,5 @@
  TEMPLATE	= lib
@@ -750,6 +590,7 @@
  HEADERS		= editor.h  \
  		  parenmatcher.h  \
---- qt-x11-free-3.3.5/tools/designer/uic/form.cpp	2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/designer/uic/form.cpp	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/uic/form.cpp qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp
+--- qt-x11-free-3.3.6/tools/designer/uic/form.cpp	2005-08-31 06:13:47.000000000 -0400
++++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -731,6 +731,13 @@
              while ( !n2.isNull() ) {
@@ -766,6 +607,7 @@
                  }
                  n2 = n2.nextSibling().toElement();
---- qt-x11-free-3.3.5/tools/designer/uic/uic.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/designer/uic/uic.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/uic/uic.pro qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro
+--- qt-x11-free-3.3.6/tools/designer/uic/uic.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -40,3 +40,6 @@
     LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
@@ -775,6 +617,7 @@
 +CXXFLAGS += -mdynamic-no-pic
 +
---- qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/linguist/linguist.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro
+--- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -43,6 +43,8 @@
      staticlib:CONFIG -= global_init_link_order #yuck
@@ -786,6 +629,7 @@
  PROJECTNAME	= Qt Linguist
  
---- qt-x11-free-3.3.5/tools/linguist/linguist.pro	2004-06-08 04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/linguist/linguist.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist.pro
+--- qt-x11-free-3.3.6/tools/linguist/linguist.pro	2004-06-08 04:06:56.000000000 -0400
++++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -1,8 +1,5 @@
  TEMPLATE	= subdirs
@@ -797,6 +641,7 @@
  		  lupdate \
  		  qm2ts
---- qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/lrelease/lrelease.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro
+--- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -15,3 +15,6 @@
  
@@ -806,6 +651,7 @@
 +QMAKE_CFLAGS += -mdynamic-no-pic
 +QMAKE_CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/lupdate/lupdate.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro
+--- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -19,3 +19,7 @@
  
@@ -816,6 +662,7 @@
 +macx:CXXFLAGS += -mdynamic-no-pic
 +
---- qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/qm2ts/qm2ts.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro
+--- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -13,3 +13,6 @@
  
@@ -825,6 +672,7 @@
 +CFLAGS += -mdynamic-no-pic
 +CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro	2005-07-19 20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/qtconfig/qtconfig.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro
+--- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro	2005-07-19 20:59:24.000000000 -0400
++++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -15,4 +15,7 @@
  INSTALLS	+= target
@@ -835,14 +683,2 @@
 +CXXFLAGS += -mdynamic-no-pic
  REQUIRES=full-config nocrosscompiler !win32*
---- qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp.orig	2006-03-02 00:21:49.000000000 -0500
-+++ qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp	2006-03-02 00:22:47.000000000 -0500
-@@ -2670,6 +2670,9 @@
- 
- void QWidget::createInputContext()
- {
-+    if( !isInputMethodEnabled() || QApplication::closingDown() )
-+	return;
-+
-     QWidget *tlw = topLevelWidget();
-     QTLWExtra *topdata = tlw->topData();
- 
Index: trunk/dports/x11/qt3/files/qt3-tiger.patch
===================================================================
--- trunk/dports/x11/qt3/files/qt3-tiger.patch	(revision 17152)
+++ trunk/dports/x11/qt3/files/qt3-tiger.patch	(revision 17153)
@@ -1,4 +1,5 @@
---- qt-x11-free-3.3.5/Makefile	2005-01-03 11:08:00.000000000 -0500
-+++ qt-x11-free-3.3.5-new/Makefile	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/Makefile qt-x11-free-3.3.6-new/Makefile
+--- qt-x11-free-3.3.6/Makefile	2005-01-03 11:08:00.000000000 -0500
++++ qt-x11-free-3.3.6-new/Makefile	2006-03-15 21:47:34.000000000 -0500
 @@ -11,7 +11,7 @@
  install: FORCE
@@ -10,6 +11,7 @@
  	@echo "The Qt library is now built in ./lib"
  	@echo "The Qt examples are built in the directories in ./examples"
---- qt-x11-free-3.3.5/configure	2005-08-22 05:31:26.000000000 -0400
-+++ qt-x11-free-3.3.5-new/configure	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/configure qt-x11-free-3.3.6-new/configure
+--- qt-x11-free-3.3.6/configure	2006-03-08 07:11:24.000000000 -0500
++++ qt-x11-free-3.3.6-new/configure	2006-03-15 21:50:20.000000000 -0500
 @@ -36,7 +36,7 @@
  
@@ -21,5 +23,5 @@
  UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
  
-@@ -1046,8 +1046,8 @@
+@@ -1051,8 +1051,8 @@
  [ -z "$QT_INSTALL_DATA" ]         && QT_INSTALL_DATA=$QT_INSTALL_PREFIX
  # default PREFIX/translations
@@ -32,5 +34,5 @@
  # generate qconfig.cpp
  [ -d $outpath/src/tools ] || mkdir -p $outpath/src/tools
-@@ -3031,7 +3031,7 @@
+@@ -3085,7 +3085,7 @@
  	COMPILER_VERSION="3.*"
  	;;
@@ -41,84 +43,10 @@
      *)
  	;;
---- qt-x11-free-3.3.5/include/private/qcom_p.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qcom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -53,6 +53,10 @@
- #include "quuid.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_COMPONENT
- 
- class QObject;
---- qt-x11-free-3.3.5/include/private/qimageformatinterface_p.h	2005-09-02 08:43:04.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qimageformatinterface_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -40,6 +40,9 @@
- #include <private/qcom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- //
- //  W A R N I N G
---- qt-x11-free-3.3.5/include/private/qucom_p.h	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qucom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -59,6 +59,10 @@
- #undef check
- #endif
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- struct QUObject;
- struct QUInterfaceDescription;
- struct QUnknownInterface;
---- qt-x11-free-3.3.5/include/private/qucomextra_p.h	2005-09-02 08:43:01.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/private/qucomextra_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -54,6 +54,9 @@
- #include <private/qucom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QVariant;
- 
---- qt-x11-free-3.3.5/include/qasyncimageio.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qasyncimageio.h	2006-02-11 11:24:10.000000000 -0500
-@@ -44,6 +44,9 @@
- 
- #ifndef QT_NO_ASYNC_IMAGE_IO
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class Q_EXPORT QImageConsumer {
- public:
---- qt-x11-free-3.3.5/include/qfiledialog.h	2005-09-02 08:42:52.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qfiledialog.h	2006-02-11 11:24:10.000000000 -0500
-@@ -58,6 +58,10 @@
- #include "qurlinfo.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_FILEDIALOG
- 
- class Q_EXPORT QFileIconProvider : public QObject
---- qt-x11-free-3.3.5/include/qglobal.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qglobal.h	2006-02-11 11:36:55.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/include/qglobal.h qt-x11-free-3.3.6-new/include/qglobal.h
+--- qt-x11-free-3.3.6/include/qglobal.h	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/include/qglobal.h	2006-03-15 21:47:34.000000000 -0500
 @@ -44,6 +44,10 @@
   */
- #define QT_VERSION 0x030305
+ #define QT_VERSION 0x030306
  
 +#ifndef __DARWIN_X11__
@@ -129,5 +57,5 @@
     The operating system, must be one of: (Q_OS_x)
  
-@@ -545,6 +549,8 @@
+@@ -562,6 +566,8 @@
  
  #if defined(Q_OS_MAC9)
@@ -138,5 +66,5 @@
  #  define Q_WS_WIN16
  #  error "Qt requires Win32 and does not work with Windows 3.x"
-@@ -865,6 +871,10 @@
+@@ -882,6 +888,10 @@
  #    define Q_TEMPLATE_EXTERN
  #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
@@ -149,19 +77,7 @@
  #  undef QT_MAKEDLL		/* ignore these for other platforms */
  #  undef QT_DLL
---- qt-x11-free-3.3.5/include/qnetworkprotocol.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qnetworkprotocol.h	2006-02-11 11:24:10.000000000 -0500
-@@ -47,6 +47,10 @@
- 
- #ifndef QT_NO_NETWORKPROTOCOL
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- class QNetworkProtocol;
- class QNetworkOperation;
- class QTimer;
---- qt-x11-free-3.3.5/include/qprogressbar.h	2005-09-02 08:43:14.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qprogressbar.h	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/include/qprogressbar.h qt-x11-free-3.3.6-new/include/qprogressbar.h
+--- qt-x11-free-3.3.6/include/qprogressbar.h	2006-03-08 11:47:58.000000000 -0500
++++ qt-x11-free-3.3.6-new/include/qprogressbar.h	2006-03-15 21:47:34.000000000 -0500
 @@ -61,6 +61,7 @@
  public:
@@ -180,18 +96,7 @@
  private:
      int		total_steps;
---- qt-x11-free-3.3.5/include/qtooltip.h	2005-09-02 08:43:15.000000000 -0400
-+++ qt-x11-free-3.3.5-new/include/qtooltip.h	2006-02-11 11:24:10.000000000 -0500
-@@ -42,6 +42,9 @@
- 
- #ifndef QT_NO_TOOLTIP
- 
-+#if __GNUC__  - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QTipManager;
- class QIconViewToolTip;
---- qt-x11-free-3.3.5/mkspecs/darwin-g++/qmake.conf	2005-09-02 08:43:37.000000000 -0400
-+++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qmake.conf	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf
+--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qmake.conf	2006-03-08 11:48:20.000000000 -0500
++++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qmake.conf	2006-03-15 21:47:34.000000000 -0500
 @@ -9,19 +9,19 @@
  MAKEFILE_GENERATOR	= UNIX
@@ -299,6 +204,7 @@
 +QMAKE_CHK_DIR_EXISTS	= /bin/test -d
 +QMAKE_MKDIR		= /bin/mkdir -p
---- qt-x11-free-3.3.5/mkspecs/darwin-g++/qplatformdefs.h	2003-05-27 11:19:20.000000000 -0400
-+++ qt-x11-free-3.3.5-new/mkspecs/darwin-g++/qplatformdefs.h	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h
+--- qt-x11-free-3.3.6/mkspecs/darwin-g++/qplatformdefs.h	2003-05-27 11:19:20.000000000 -0400
++++ qt-x11-free-3.3.6-new/mkspecs/darwin-g++/qplatformdefs.h	2006-03-15 21:47:34.000000000 -0500
 @@ -74,12 +74,13 @@
  #define QT_SIGNAL_ARGS		int
@@ -316,6 +222,7 @@
  
  #endif // QPLATFORMDEFS_H
---- qt-x11-free-3.3.5/qmake/Makefile.unix	2004-09-13 14:24:42.000000000 -0400
-+++ qt-x11-free-3.3.5-new/qmake/Makefile.unix	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/qmake/Makefile.unix qt-x11-free-3.3.6-new/qmake/Makefile.unix
+--- qt-x11-free-3.3.6/qmake/Makefile.unix	2006-02-28 05:32:54.000000000 -0500
++++ qt-x11-free-3.3.6-new/qmake/Makefile.unix	2006-03-15 21:47:34.000000000 -0500
 @@ -36,8 +36,8 @@
  	-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
@@ -329,6 +236,7 @@
  qmake: $(OBJS) $(QOBJS)
  	$(CXX) -o $@ $(OBJS) $(QOBJS) $(LFLAGS)
---- qt-x11-free-3.3.5/qmake/main.cpp	2005-09-02 08:43:19.000000000 -0400
-+++ qt-x11-free-3.3.5-new/qmake/main.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/qmake/main.cpp qt-x11-free-3.3.6-new/qmake/main.cpp
+--- qt-x11-free-3.3.6/qmake/main.cpp	2006-03-08 11:48:02.000000000 -0500
++++ qt-x11-free-3.3.6-new/qmake/main.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -49,7 +49,7 @@
  
@@ -340,56 +248,7 @@
  bool qt_resolve_symlinks = FALSE;
  #endif
---- qt-x11-free-3.3.5/src/dialogs/qfiledialog.h	2005-09-02 08:42:52.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/dialogs/qfiledialog.h	2006-02-11 11:24:10.000000000 -0500
-@@ -58,6 +58,10 @@
- #include "qurlinfo.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_FILEDIALOG
- 
- class Q_EXPORT QFileIconProvider : public QObject
---- qt-x11-free-3.3.5/src/kernel/qasyncimageio.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qasyncimageio.h	2006-02-11 11:24:10.000000000 -0500
-@@ -44,6 +44,9 @@
- 
- #ifndef QT_NO_ASYNC_IMAGE_IO
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class Q_EXPORT QImageConsumer {
- public:
---- qt-x11-free-3.3.5/src/kernel/qimageformatinterface_p.h	2005-09-02 08:43:04.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qimageformatinterface_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -40,6 +40,9 @@
- #include <private/qcom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- //
- //  W A R N I N G
---- qt-x11-free-3.3.5/src/kernel/qnetworkprotocol.h	2005-09-02 08:43:05.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qnetworkprotocol.h	2006-02-11 11:24:10.000000000 -0500
-@@ -47,6 +47,10 @@
- 
- #ifndef QT_NO_NETWORKPROTOCOL
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- class QNetworkProtocol;
- class QNetworkOperation;
- class QTimer;
---- qt-x11-free-3.3.5/src/kernel/qprocess_unix.cpp	2005-09-02 08:43:01.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qprocess_unix.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp
+--- qt-x11-free-3.3.6/src/kernel/qprocess_unix.cpp	2006-03-08 11:47:45.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/kernel/qprocess_unix.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -761,7 +761,7 @@
  #endif
@@ -428,18 +287,20 @@
  #else
  			    arglistQ[0] = fileInfo.filePath().local8Bit();
---- qt-x11-free-3.3.5/src/kernel/qucomextra_p.h	2005-09-02 08:43:01.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/kernel/qucomextra_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -54,6 +54,9 @@
- #include <private/qucom_p.h>
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QVariant;
- 
---- qt-x11-free-3.3.5/src/moc/moc.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/moc/moc.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp
+--- qt-x11-free-3.3.6/src/kernel/qwidget_x11.cpp	2006-03-08 11:47:47.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/kernel/qwidget_x11.cpp	2006-03-15 21:47:34.000000000 -0500
+@@ -2671,6 +2671,9 @@
+ 
+ void QWidget::createInputContext()
+ {
++    if( !isInputMethodEnabled() || QApplication::closingDown() )
++	return;
++
+     QWidget *tlw = topLevelWidget();
+     QTLWExtra *topdata = tlw->topData();
+ 
+diff -uNr qt-x11-free-3.3.6/src/moc/moc.pro qt-x11-free-3.3.6-new/src/moc/moc.pro
+--- qt-x11-free-3.3.6/src/moc/moc.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/moc/moc.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -48,6 +48,8 @@
  unix:SOURCES	+= ../tools/qfile_unix.cpp ../tools/qdir_unix.cpp ../tools/qfileinfo_unix.cpp
@@ -451,6 +312,7 @@
  target.path=$$bins.path
  INSTALLS += target
---- qt-x11-free-3.3.5/src/network/qdns.cpp	2005-09-02 08:42:59.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/network/qdns.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/network/qdns.cpp qt-x11-free-3.3.6-new/src/network/qdns.cpp
+--- qt-x11-free-3.3.6/src/network/qdns.cpp	2006-03-08 11:47:43.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/network/qdns.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -76,7 +76,7 @@
  #include "qcleanuphandler.h"
@@ -462,6 +324,7 @@
  
  //#define QDNS_DEBUG
---- qt-x11-free-3.3.5/src/qt_professional.pri	2004-02-06 07:08:19.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/qt_professional.pri	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/qt_professional.pri qt-x11-free-3.3.6-new/src/qt_professional.pri
+--- qt-x11-free-3.3.6/src/qt_professional.pri	2004-02-06 07:08:19.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/qt_professional.pri	2006-03-15 21:47:34.000000000 -0500
 @@ -25,7 +25,6 @@
  	unix {
@@ -472,6 +335,7 @@
  	include( $$QT_SOURCE_TREE/src/network/qt_network.pri )
  	DEFINES     *= QT_MODULE_NETWORK
---- qt-x11-free-3.3.5/src/qtmain.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/qtmain.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/qtmain.pro qt-x11-free-3.3.6-new/src/qtmain.pro
+--- qt-x11-free-3.3.6/src/qtmain.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/qtmain.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -2,6 +2,7 @@
  TEMPLATE = lib
@@ -482,19 +346,7 @@
  
  CONFIG	+= qt staticlib warn_on release
---- qt-x11-free-3.3.5/src/tools/qcom_p.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qcom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -53,6 +53,10 @@
- #include "quuid.h"
- #endif // QT_H
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- #ifndef QT_NO_COMPONENT
- 
- class QObject;
---- qt-x11-free-3.3.5/src/tools/qdir_unix.cpp	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qdir_unix.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qdir_unix.cpp qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp
+--- qt-x11-free-3.3.6/src/tools/qdir_unix.cpp	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qdir_unix.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -88,7 +88,7 @@
  
@@ -506,6 +358,7 @@
      if (dirName[dirName.length() - 1] == "/")
  	name = dirName.left( dirName.length() - 1 );
---- qt-x11-free-3.3.5/src/tools/qglobal.cpp	2005-09-02 08:42:55.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qglobal.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.cpp qt-x11-free-3.3.6-new/src/tools/qglobal.cpp
+--- qt-x11-free-3.3.6/src/tools/qglobal.cpp	2006-03-08 11:47:40.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qglobal.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -161,7 +161,7 @@
      return TRUE;
@@ -517,9 +370,10 @@
  #include "qt_mac.h"
  
---- qt-x11-free-3.3.5/src/tools/qglobal.h	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qglobal.h	2006-02-11 11:36:55.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qglobal.h qt-x11-free-3.3.6-new/src/tools/qglobal.h
+--- qt-x11-free-3.3.6/src/tools/qglobal.h	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qglobal.h	2006-03-15 21:47:34.000000000 -0500
 @@ -44,6 +44,10 @@
   */
- #define QT_VERSION 0x030305
+ #define QT_VERSION 0x030306
  
 +#ifndef __DARWIN_X11__
@@ -530,5 +384,5 @@
     The operating system, must be one of: (Q_OS_x)
  
-@@ -545,6 +549,8 @@
+@@ -562,6 +566,8 @@
  
  #if defined(Q_OS_MAC9)
@@ -539,5 +393,5 @@
  #  define Q_WS_WIN16
  #  error "Qt requires Win32 and does not work with Windows 3.x"
-@@ -865,6 +871,10 @@
+@@ -882,6 +888,10 @@
  #    define Q_TEMPLATE_EXTERN
  #    undef  Q_DISABLE_COPY 	/* avoid unresolved externals */
@@ -550,6 +404,7 @@
  #  undef QT_MAKEDLL		/* ignore these for other platforms */
  #  undef QT_DLL
---- qt-x11-free-3.3.5/src/tools/qgpluginmanager.cpp	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qgpluginmanager.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp
+--- qt-x11-free-3.3.6/src/tools/qgpluginmanager.cpp	2006-03-08 11:47:38.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qgpluginmanager.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -316,7 +316,7 @@
  
@@ -561,6 +416,7 @@
  #elif defined(Q_OS_HPUX)
      QString filter = "*.sl";
---- qt-x11-free-3.3.5/src/tools/qlibrary.cpp	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qlibrary.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qlibrary.cpp qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp
+--- qt-x11-free-3.3.6/src/tools/qlibrary.cpp	2006-03-08 11:47:37.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qlibrary.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -400,7 +400,7 @@
  	filename += ".dll";
@@ -572,6 +428,7 @@
      filters << ".bundle";
      filters << ".dylib"; //the last one is also the default one..
---- qt-x11-free-3.3.5/src/tools/qmutex_unix.cpp	2005-09-02 08:42:53.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qmutex_unix.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp
+--- qt-x11-free-3.3.6/src/tools/qmutex_unix.cpp	2006-03-08 11:47:37.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qmutex_unix.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -44,7 +44,7 @@
  // POSIX threads mutex types
@@ -583,6 +440,7 @@
  #  define Q_MUTEX_SET_TYPE(a, b) pthread_mutexattr_settype((a), (b))
  #  if defined(QT_CHECK_RANGE)
---- qt-x11-free-3.3.5/src/tools/qstring.cpp	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qstring.cpp	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qstring.cpp qt-x11-free-3.3.6-new/src/tools/qstring.cpp
+--- qt-x11-free-3.3.6/src/tools/qstring.cpp	2006-03-08 11:47:39.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qstring.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -1362,7 +1362,7 @@
  QStringData* QString::makeSharedNull()
@@ -621,6 +479,7 @@
  	return findRev( *str.unicode(), index, cs );
  #endif
---- qt-x11-free-3.3.5/src/tools/qt_tools.pri	2004-04-01 05:20:06.000000000 -0500
-+++ qt-x11-free-3.3.5-new/src/tools/qt_tools.pri	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/tools/qt_tools.pri qt-x11-free-3.3.6-new/src/tools/qt_tools.pri
+--- qt-x11-free-3.3.6/src/tools/qt_tools.pri	2004-04-01 05:20:06.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/tools/qt_tools.pri	2006-03-15 21:47:34.000000000 -0500
 @@ -101,10 +101,6 @@
  		  $$TOOLS_CPP/qwaitcondition_unix.cpp
@@ -634,19 +493,7 @@
  
  	SOURCES += $$TOOLS_CPP/qbitarray.cpp \
---- qt-x11-free-3.3.5/src/tools/qucom_p.h	2005-09-02 08:42:54.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/tools/qucom_p.h	2006-02-11 11:24:10.000000000 -0500
-@@ -59,6 +59,10 @@
- #undef check
- #endif
- 
-+#if __GNUC__ - 0 > 3
-+#pragma GCC system_header
-+#endif
-+
- struct QUObject;
- struct QUInterfaceDescription;
- struct QUnknownInterface;
---- qt-x11-free-3.3.5/src/widgets/qprogressbar.cpp	2005-09-02 08:43:14.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.cpp	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp
+--- qt-x11-free-3.3.6/src/widgets/qprogressbar.cpp	2006-03-08 11:47:58.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -105,7 +105,6 @@
      initFrame();
@@ -678,6 +525,7 @@
  /*!
      This method is called to generate the text displayed in the center
---- qt-x11-free-3.3.5/src/widgets/qprogressbar.h	2005-09-02 08:43:14.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/widgets/qprogressbar.h	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/src/widgets/qprogressbar.h qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h
+--- qt-x11-free-3.3.6/src/widgets/qprogressbar.h	2006-03-08 11:47:58.000000000 -0500
++++ qt-x11-free-3.3.6-new/src/widgets/qprogressbar.h	2006-03-15 21:47:34.000000000 -0500
 @@ -61,6 +61,7 @@
  public:
@@ -696,18 +544,7 @@
  private:
      int		total_steps;
---- qt-x11-free-3.3.5/src/widgets/qtooltip.h	2005-09-02 08:43:15.000000000 -0400
-+++ qt-x11-free-3.3.5-new/src/widgets/qtooltip.h	2006-02-11 11:24:10.000000000 -0500
-@@ -42,6 +42,9 @@
- 
- #ifndef QT_NO_TOOLTIP
- 
-+#if __GNUC__  - 0 > 3
-+#pragma GCC system_header
-+#endif
- 
- class QTipManager;
- class QIconViewToolTip;
---- qt-x11-free-3.3.5/tools/assistant/assistant.pro	2003-11-17 07:40:25.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/assistant/assistant.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/assistant/assistant.pro qt-x11-free-3.3.6-new/tools/assistant/assistant.pro
+--- qt-x11-free-3.3.6/tools/assistant/assistant.pro	2003-11-17 07:40:25.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/assistant/assistant.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -32,6 +32,8 @@
  
@@ -719,6 +556,7 @@
  target.path = $$bins.path
  INSTALLS += target
---- qt-x11-free-3.3.5/tools/designer/app/app.pro	2004-01-16 19:51:08.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/designer/app/app.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/app/app.pro qt-x11-free-3.3.6-new/tools/designer/app/app.pro
+--- qt-x11-free-3.3.6/tools/designer/app/app.pro	2004-01-16 19:51:08.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/app/app.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -20,7 +20,8 @@
     QMAKE_INFO_PLIST = Info_mac.plist
@@ -731,6 +569,7 @@
  target.path=$$bins.path
  INSTALLS        += target
---- qt-x11-free-3.3.5/tools/designer/designer/designer.pro	2004-07-29 09:09:50.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/designer/designer/designer.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/designer/designer.pro qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro
+--- qt-x11-free-3.3.6/tools/designer/designer/designer.pro	2006-02-15 10:48:20.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/designer/designer.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -1,6 +1,6 @@
  TEMPLATE	= lib
@@ -741,6 +580,7 @@
  !force_static:!win32:contains(QT_PRODUCT,qt-internal) {
     CONFIG          -= staticlib
---- qt-x11-free-3.3.5/tools/designer/editor/editor.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/designer/editor/editor.pro	2006-02-11 11:24:10.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/editor/editor.pro qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro
+--- qt-x11-free-3.3.6/tools/designer/editor/editor.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/editor/editor.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -1,5 +1,5 @@
  TEMPLATE	= lib
@@ -750,6 +590,7 @@
  HEADERS		= editor.h  \
  		  parenmatcher.h  \
---- qt-x11-free-3.3.5/tools/designer/uic/form.cpp	2005-08-31 06:13:47.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/designer/uic/form.cpp	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/uic/form.cpp qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp
+--- qt-x11-free-3.3.6/tools/designer/uic/form.cpp	2005-08-31 06:13:47.000000000 -0400
++++ qt-x11-free-3.3.6-new/tools/designer/uic/form.cpp	2006-03-15 21:47:34.000000000 -0500
 @@ -731,6 +731,13 @@
              while ( !n2.isNull() ) {
@@ -766,6 +607,7 @@
                  }
                  n2 = n2.nextSibling().toElement();
---- qt-x11-free-3.3.5/tools/designer/uic/uic.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/designer/uic/uic.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/designer/uic/uic.pro qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro
+--- qt-x11-free-3.3.6/tools/designer/uic/uic.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/designer/uic/uic.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -40,3 +40,6 @@
     LIBS += $$MWERKSDIR/Libraries/PluginLib4.shlb
@@ -775,6 +617,7 @@
 +CXXFLAGS += -mdynamic-no-pic
 +
---- qt-x11-free-3.3.5/tools/linguist/linguist/linguist.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/linguist/linguist.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro
+--- qt-x11-free-3.3.6/tools/linguist/linguist/linguist.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/linguist/linguist.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -43,6 +43,8 @@
      staticlib:CONFIG -= global_init_link_order #yuck
@@ -786,6 +629,7 @@
  PROJECTNAME	= Qt Linguist
  
---- qt-x11-free-3.3.5/tools/linguist/linguist.pro	2004-06-08 04:06:56.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/linguist/linguist.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/linguist.pro qt-x11-free-3.3.6-new/tools/linguist/linguist.pro
+--- qt-x11-free-3.3.6/tools/linguist/linguist.pro	2004-06-08 04:06:56.000000000 -0400
++++ qt-x11-free-3.3.6-new/tools/linguist/linguist.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -1,8 +1,5 @@
  TEMPLATE	= subdirs
@@ -797,6 +641,7 @@
  		  lupdate \
  		  qm2ts
---- qt-x11-free-3.3.5/tools/linguist/lrelease/lrelease.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/lrelease/lrelease.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro
+--- qt-x11-free-3.3.6/tools/linguist/lrelease/lrelease.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/lrelease/lrelease.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -15,3 +15,6 @@
  
@@ -806,6 +651,7 @@
 +QMAKE_CFLAGS += -mdynamic-no-pic
 +QMAKE_CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.5/tools/linguist/lupdate/lupdate.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/lupdate/lupdate.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro
+--- qt-x11-free-3.3.6/tools/linguist/lupdate/lupdate.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/lupdate/lupdate.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -19,3 +19,7 @@
  
@@ -816,6 +662,7 @@
 +macx:CXXFLAGS += -mdynamic-no-pic
 +
---- qt-x11-free-3.3.5/tools/linguist/qm2ts/qm2ts.pro	2003-10-31 09:36:28.000000000 -0500
-+++ qt-x11-free-3.3.5-new/tools/linguist/qm2ts/qm2ts.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro
+--- qt-x11-free-3.3.6/tools/linguist/qm2ts/qm2ts.pro	2003-10-31 09:36:28.000000000 -0500
++++ qt-x11-free-3.3.6-new/tools/linguist/qm2ts/qm2ts.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -13,3 +13,6 @@
  
@@ -825,6 +672,7 @@
 +CFLAGS += -mdynamic-no-pic
 +CXXFLAGS += -mdynamic-no-pic
---- qt-x11-free-3.3.5/tools/qtconfig/qtconfig.pro	2005-07-19 20:59:24.000000000 -0400
-+++ qt-x11-free-3.3.5-new/tools/qtconfig/qtconfig.pro	2006-02-11 11:24:11.000000000 -0500
+diff -uNr qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro
+--- qt-x11-free-3.3.6/tools/qtconfig/qtconfig.pro	2005-07-19 20:59:24.000000000 -0400
++++ qt-x11-free-3.3.6-new/tools/qtconfig/qtconfig.pro	2006-03-15 21:47:34.000000000 -0500
 @@ -15,4 +15,7 @@
  INSTALLS	+= target
@@ -835,14 +683,2 @@
 +CXXFLAGS += -mdynamic-no-pic
  REQUIRES=full-config nocrosscompiler !win32*
---- qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp.orig	2006-03-02 00:21:49.000000000 -0500
-+++ qt-x11-free-3.3.5/src/kernel/qwidget_x11.cpp	2006-03-02 00:22:47.000000000 -0500
-@@ -2670,6 +2670,9 @@
- 
- void QWidget::createInputContext()
- {
-+    if( !isInputMethodEnabled() || QApplication::closingDown() )
-+	return;
-+
-     QWidget *tlw = topLevelWidget();
-     QTLWExtra *topdata = tlw->topData();
- 
