Changes 4.1.1:

* Bug fixes and improvements
  (please, read 'changes-4.1.1' for details)

5 files changed, 29 insertions, 19 deletions

diff --git a/x11/qt4-libs/distinfo b/x11/qt4-libs/distinfo
index c155dae3b78..9ea7897d044 100644
--- a/x11/qt4-libs/distinfo
+++ b/x11/qt4-libs/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $
+$NetBSD: distinfo,v 1.2 2006/02/28 18:02:47 adam Exp $
 
-SHA1 (qt-x11-opensource-src-4.1.0.tar.gz) = 79e00309910f9d02873018ac4bd114446ba9b76c
-RMD160 (qt-x11-opensource-src-4.1.0.tar.gz) = 4316f965e56dd92e02885dc4d2b1149321be0c72
-Size (qt-x11-opensource-src-4.1.0.tar.gz) = 25634393 bytes
-SHA1 (patch-aa) = d27c5af9b53a7421572cdc2d4fb66a9ebae3c4ab
+SHA1 (qt-x11-opensource-src-4.1.1.tar.gz) = 44ca2afc223e327c6d326f5ee07a0049869defa5
+RMD160 (qt-x11-opensource-src-4.1.1.tar.gz) = 188d99f3ac2929038238229e3b432fc5d5465af2
+Size (qt-x11-opensource-src-4.1.1.tar.gz) = 27761487 bytes
+SHA1 (patch-aa) = 5587f3d9c0613f9be04de1eed76175c9342ce5e0
 SHA1 (patch-ab) = 6c42d051ce036820167bcecc0480f7dd6d2f7334
 SHA1 (patch-ac) = 766ca4aba25029765f83c8a72873b603864ea821
 SHA1 (patch-ad) = 25057aa091f8d144a991101e59e7dd5dd51baa67
diff --git a/x11/qt4-libs/patches/patch-aa b/x11/qt4-libs/patches/patch-aa
index f45ea3d4190..4580bba13ca 100644
--- a/x11/qt4-libs/patches/patch-aa
+++ b/x11/qt4-libs/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $
+$NetBSD: patch-aa,v 1.2 2006/02/28 18:02:47 adam Exp $
 
---- qmake/generators/unix/unixmake2.cpp.orig	2006-02-19 21:08:33.000000000 +0100
+--- qmake/generators/unix/unixmake2.cpp.orig	2006-02-16 11:51:34.000000000 +0100
 +++ qmake/generators/unix/unixmake2.cpp
-@@ -1281,7 +1281,7 @@ UnixMakefileGenerator::writePkgConfigFil
+@@ -1282,7 +1282,7 @@ UnixMakefileGenerator::writePkgConfigFil
      else
          libs << "QMAKE_LIBS"; //obvious one
      libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index cb0c85e391b..e8ab30ff281 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/02/25 09:25:00 adam Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/28 18:02:47 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -29,8 +29,8 @@ do-install:
 		${MAKE_PROGRAM} -f Makefile.Release install_assistant_headers
 	cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} \
 		${MAKE_PROGRAM} -f Makefile.Release install_designer_headers
-	cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} \
-		${MAKE_PROGRAM} -f Makefile install_quitools_headers
+#	cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} \
+#		${MAKE_PROGRAM} -f Makefile install_quitools_headers
 	cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} \
 		${MAKE_PROGRAM} -f Makefile install_qtestlib_headers
 	${INSTALL_LIB} ${WRKSRC}/lib/libQtAssistantClient.a ${QTPREFIX}/lib/
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 23ec89e6ef7..2f24fc19555 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/02/25 09:25:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/02/28 18:02:47 adam Exp $
 lib/pkgconfig/QtTest.pc
 qt4/bin/assistant
 qt4/bin/designer
@@ -76,12 +76,13 @@ qt4/include/QtDesigner/qdesigner_components.h
 qt4/include/QtDesigner/qdesigner_components_global.h
 qt4/include/QtDesigner/qdesignerexportwidget.h
 qt4/include/QtDesigner/qextensionmanager.h
-qt4/include/QtDesigner/resourceeditor.h
 qt4/include/QtDesigner/sdk_global.h
 qt4/include/QtDesigner/taskmenu.h
 qt4/include/QtDesigner/ui4.h
 qt4/include/QtDesigner/uilib_global.h
+qt4/include/QtTest/QEventSizeOfChecker
 qt4/include/QtTest/QSignalSpy
+qt4/include/QtTest/QSpontaneKeyEvent
 qt4/include/QtTest/QTestAccessibility
 qt4/include/QtTest/QTestAccessibilityEvent
 qt4/include/QtTest/QTestData
@@ -105,10 +106,8 @@ qt4/include/QtTest/qtestevent.h
 qt4/include/QtTest/qtesteventloop.h
 qt4/include/QtTest/qtestkeyboard.h
 qt4/include/QtTest/qtestmouse.h
+qt4/include/QtTest/qtestspontaneevent.h
 qt4/include/QtTest/qtestsystem.h
-qt4/include/QtUiTools/QUiLoader
-qt4/include/QtUiTools/QtUiTools
-qt4/include/QtUiTools/quiloader.h
 qt4/lib/libQtAssistantClient.a
 qt4/lib/libQtDesigner.la
 qt4/lib/libQtDesignerComponents.la
@@ -231,6 +230,8 @@ qt4/mkspecs/linux-kcc/qmake.conf
 qt4/mkspecs/linux-kcc/qplatformdefs.h
 qt4/mkspecs/linux-kylix/qmake.conf
 qt4/mkspecs/linux-kylix/qplatformdefs.h
+qt4/mkspecs/linux-lsb/qmake.conf
+qt4/mkspecs/linux-lsb/qplatformdefs.h
 qt4/mkspecs/linux-pgcc/qmake.conf
 qt4/mkspecs/linux-pgcc/qplatformdefs.h
 qt4/mkspecs/lynxos-g++/qmake.conf
@@ -259,6 +260,10 @@ qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
 qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-arm-g++/qmake.conf
 qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-cellon-g++/qmake.conf
+qt4/mkspecs/qws/linux-cellon-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-generic-g++-32/qmake.conf
+qt4/mkspecs/qws/linux-generic-g++-32/qplatformdefs.h
 qt4/mkspecs/qws/linux-generic-g++/qmake.conf
 qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
@@ -271,6 +276,8 @@ qt4/mkspecs/qws/linux-x86-g++/qmake.conf
 qt4/mkspecs/qws/linux-x86-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-x86_64-g++/qmake.conf
 qt4/mkspecs/qws/linux-x86_64-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-zylonite-g++/qmake.conf
+qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
 qt4/mkspecs/qws/macx-generic-g++/qmake.conf
 qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/qmake.conf
@@ -324,12 +331,15 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/sco-cc
 @dirrm qt4/mkspecs/qws/solaris-generic-g++
 @dirrm qt4/mkspecs/qws/macx-generic-g++
+@dirrm qt4/mkspecs/qws/linux-zylonite-g++
 @dirrm qt4/mkspecs/qws/linux-x86_64-g++
 @dirrm qt4/mkspecs/qws/linux-x86-g++
 @dirrm qt4/mkspecs/qws/linux-sharp-g++
 @dirrm qt4/mkspecs/qws/linux-mips-g++
 @dirrm qt4/mkspecs/qws/linux-ipaq-g++
 @dirrm qt4/mkspecs/qws/linux-generic-g++
+@dirrm qt4/mkspecs/qws/linux-generic-g++-32
+@dirrm qt4/mkspecs/qws/linux-cellon-g++
 @dirrm qt4/mkspecs/qws/linux-arm-g++
 @dirrm qt4/mkspecs/qws/freebsd-generic-g++
 @dirrm qt4/mkspecs/qws
@@ -342,6 +352,7 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/macx-g++
 @dirrm qt4/mkspecs/lynxos-g++
 @dirrm qt4/mkspecs/linux-pgcc
+@dirrm qt4/mkspecs/linux-lsb
 @dirrm qt4/mkspecs/linux-kylix
 @dirrm qt4/mkspecs/linux-kcc
 @dirrm qt4/mkspecs/linux-icc
@@ -378,7 +389,6 @@ qt4/plugins/designer/libqt3supportwidgets.la
 @dirrm qt4/mkspecs/aix-g++-64
 @dirrm qt4/mkspecs/aix-g++
 @dirrm qt4/mkspecs
-@dirrm qt4/include/QtUiTools
 @dirrm qt4/include/QtTest
 @dirrm qt4/include/QtDesigner
 @dirrm qt4/include/QtAssistant
diff --git a/x11/qt4/Makefile.common b/x11/qt4/Makefile.common
index 5bd72be6490..55b33448cbc 100644
--- a/x11/qt4/Makefile.common
+++ b/x11/qt4/Makefile.common
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2006/02/20 12:07:12 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2006/02/28 18:02:47 adam Exp $
 
-QTVERSION=	4.1.0
+QTVERSION=	4.1.1
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html