update to 4.3.0rc1.

x11/qt4/Makefile

@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.37 2007/05/17 23:54:24 espie Exp $
+# $OpenBSD: Makefile,v 1.38 2007/05/22 09:09:32 espie Exp $
 
 COMMENT-main=		"C++ X11 GUI toolkit"
 COMMENT-examples=	"examples for qt4"
@@ -14,30 +14,30 @@ PKGNAME-postgresql=	qt4-postgresql-${VERSION}
 PKGNAME-examples=	qt4-examples-${VERSION}
 PKGNAME-sqlite2=	qt4-sqlite2-${VERSION}
 PKGNAME-sqlite=		qt4-sqlite-${VERSION}
-PKGNAME-main=		qt4-${VERSION}p2
+PKGNAME-main=		qt4-${VERSION}
 FULLPKGNAME-html=	qt4-html-${VERSION}
-SHARED_LIBS=	Qt3Support 7.0 \
-		QtCore 6.2 \
-		QtDesigner 6.1 \
-		QtDesignerComponents 6.1 \
-		QtGui 7.0 \
-		QtNetwork 6.2 \
-		QtOpenGL 6.2 \
-		QtSql 6.2 \
-		QtXml 6.1 \
-		QtSvg 6.2 \
-		QtTest 6.1 \
-		QtAssistantClient 2.1 \
-		QtDBus 0.1 
+SHARED_LIBS=	Qt3Support 8.0 \
+		QtCore 7.0 \
+		QtDesigner 7.0 \
+		QtDesignerComponents 7.0 \
+		QtGui 8.0 \
+		QtNetwork 7.0 \
+		QtOpenGL 7.0 \
+		QtSql 7.0 \
+		QtXml 7.0 \
+		QtSvg 7.0 \
+		QtTest 7.0 \
+		QtAssistantClient 3.0 \
+		QtDBus 1.0 \
+		QtScript 0.0
 
 
-VERSION=	4.2.3
+VERSION=	4.3.0rc1
 DISTNAME=	qt-x11-opensource-src-${VERSION}
 
 
 CATEGORIES=	x11
-MASTER_SITES=	ftp://ftp.rediris.es/mirror/Qt/source/ \
-		ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/ \
+MASTER_SITES=	ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/ \
 		ftp://ftp.ntua.gr/pub/X11/Qt/qt/source/ \
 		ftp://ftp.tu-chemnitz.de/pub/Qt/qt/source/ \
 		http://ftp.silug.org/pub/qt/source/ \
@@ -66,6 +66,7 @@ MAKE_ENV=	QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
 PORTHOME=	${WRKDIST}
 
 CONFIGURE_STYLE= simple
+SEPARATE_BUILD=	simple
 CONFIGURE_ARGS=	-qt-gif -system-libpng -system-libjpeg -system-zlib \
 		-sm -no-g++-exceptions -system-sqlite \
 		-v -stl -xrender -fast \
@@ -77,7 +78,7 @@ CONFIGURE_ARGS=	-qt-gif -system-libpng -system-libjpeg -system-zlib \
 		-I${LOCALBASE}/include/libpng \
 		-I${X11BASE}/include/freetype2 \
 		-I${LOCALBASE}/include \
-		-L${WRKSRC}/lib \
+		-L${WRKBUILD}/lib \
 		-L${LOCALBASE}/lib
 
 .if ${FLAVOR:L:Mdebug}
@@ -102,7 +103,6 @@ CONFIGURE_ARGS+= -I${LOCALBASE}/include/postgresql \
 	    -I${LOCALBASE}/include/postgresql/server \
 	    -L${LOCALBASE}/lib \
 	    -I${LOCALBASE}/include -plugin-sql-psql
-CONFIGURE_ARGS+= -plugin-sql-sqlite
 
 CONFIGURE_ENV=	LOCALBASE=${LOCALBASE} QTDIR="${WRKSRC}" 
 
@@ -128,7 +128,7 @@ WANTLIB=		iconv intl
 
 commonWANTLIB=		ICE Xrender c GLU SM freetype pthread Xrandr Xinerama \
 			stdc++ Xcursor Xext GL Xi m X11.>=10 z fontconfig \
-			Xfixes
+			Xfixes ssl crypto
 commonLIB_DEPENDS=	png.>=2::graphics/png \
 			dbus-1::x11/dbus
 
@@ -140,7 +140,7 @@ LIB_DEPENDS-main=	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
 			jpeg::graphics/jpeg \
 			mng::graphics/libmng
 WANTLIB-main=		${WANTLIB} ${commonWANTLIB} \
-			lcms
+			lcms tiff
 
 
 LIB_DEPENDS-mysql=	${LIB_DEPENDS} ${sqlLIB_DEPENDS} \
@@ -165,7 +165,7 @@ WANTLIB-sqlite=		${WANTLIB} ${sqlWANTLIB}
 
 
 LIB_DEPENDS-examples=	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
-			QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus::${BUILD_PKGPATH}
+			QtDesigner,QtCore.>=4,QtGui,QtNetwork,QtOpenGL,QtSql,QtXml,QtSvg,QtTest,Qt3Support,QtAssistantClient,QtDBus,QtScript::${BUILD_PKGPATH}
 WANTLIB-examples=	${WANTLIB} ${commonWANTLIB}
 
 
@@ -180,7 +180,7 @@ QT_EXAMPLES=	${QT_BASEDIR}/examples
 QT_DOC=		${PREFIX}/share/doc/qt4
 QT_PLUGINSDIR=	${QT_BASEDIR}/plugins
 QT_BINDIR=	${QT_BASEDIR}/bin
-QT_PKGCFGDIR=	${QT_BASEDIR}
+QT_PKGCFGDIR=	${QT_BASEDIR}/pkgconfig
 
 DOCS=	OPENSOURCE-NOTICE.TXT README
 
@@ -207,7 +207,7 @@ post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} ${DOCS} ${QT_DOC}
 	# programs
 	${INSTALL_PROGRAM_DIR} ${QT_BINDIR} 
-	${INSTALL_PROGRAM} ${WRKBUILD}/bin/{findtr,syncqt} ${QT_BINDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/{findtr,syncqt} ${QT_BINDIR}
 .for p in ${PROGRAMS4} 
 	@ln -sf ${TRUEPREFIX}/lib/qt4/bin/$p ${PREFIX}/bin/$p4
 .endfor

x11/qt4/distinfo

@@ -1,5 +1,5 @@
-MD5 (qt-x11-opensource-src-4.2.3.tar.gz) = E/Er9Yoy6/FYN/zWBcs8mQ==
-RMD160 (qt-x11-opensource-src-4.2.3.tar.gz) = BsnDvVPda5b8aKHf6WiCrGkn3yU=
-SHA1 (qt-x11-opensource-src-4.2.3.tar.gz) = uYiqtPodzOhTLDa7Y5R6VWB26Mg=
-SHA256 (qt-x11-opensource-src-4.2.3.tar.gz) = wWPnLLACQ10dJhpHrNyyPlnBDkJj+YOl8sLSykDt51s=
-SIZE (qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (qt-x11-opensource-src-4.3.0rc1.tar.gz) = KPg5tf0+R12ZW7wKKosk8Q==
+RMD160 (qt-x11-opensource-src-4.3.0rc1.tar.gz) = nEDAwuwCuOUTi0Ic4871qiUkWLQ=
+SHA1 (qt-x11-opensource-src-4.3.0rc1.tar.gz) = mQp7wf6SsLFmDUDg4B8VQ5srDMM=
+SHA256 (qt-x11-opensource-src-4.3.0rc1.tar.gz) = 2920yFv/NzLbXrVbJupVfny0EMhN0Bqhcc3c+K4V2f4=
+SIZE (qt-x11-opensource-src-4.3.0rc1.tar.gz) = 41785034

x11/qt4/patches/patch-config_tests_unix_compile_test

@@ -1,8 +1,8 @@
-$OpenBSD: patch-config_tests_unix_compile_test,v 1.2 2006/12/06 08:32:44 espie Exp $
---- config.tests/unix/compile.test.orig	Mon Nov 27 18:26:20 2006
-+++ config.tests/unix/compile.test	Wed Dec  6 01:16:12 2006
-@@ -34,6 +34,9 @@ while [ "$#" -gt 0 ]; do
-     -f*)
+$OpenBSD: patch-config_tests_unix_compile_test,v 1.3 2007/05/22 09:09:32 espie Exp $
+--- config.tests/unix/compile.test.orig	Sun May  6 17:54:43 2007
++++ config.tests/unix/compile.test	Sun May 13 16:26:59 2007
+@@ -38,6 +38,9 @@ while [ "$#" -gt 0 ]; do
+     -m*)
          CXXFLAGS="$CXXFLAGS $PARAM"
          ;;
 +    -pthread*)

x11/qt4/patches/patch-config_tests_unix_nis_nis_cpp

@@ -1,8 +1,9 @@
-$OpenBSD: patch-config_tests_unix_nis_nis_cpp,v 1.2 2006/03/05 21:58:07 espie Exp $
---- config.tests/unix/nis/nis.cpp.orig	Thu Feb 16 11:51:21 2006
-+++ config.tests/unix/nis/nis.cpp	Sun Mar  5 12:10:37 2006
-@@ -1,4 +1,6 @@
+$OpenBSD: patch-config_tests_unix_nis_nis_cpp,v 1.3 2007/05/22 09:09:32 espie Exp $
+--- config.tests/unix/nis/nis.cpp.orig	Mon Mar 19 21:15:08 2007
++++ config.tests/unix/nis/nis.cpp	Sat Apr 21 16:08:27 2007
+@@ -1,5 +1,7 @@
  #include <sys/types.h>
+ #include <rpc/rpc.h>
 +#include <sys/types.h>
 +#include <rpc/rpc.h>
  #include <rpcsvc/ypclnt.h>

x11/qt4/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.8 2007/03/17 17:58:17 espie Exp $
---- configure.orig	Wed Feb 21 10:59:17 2007
-+++ configure	Sat Mar 17 10:47:27 2007
-@@ -1402,7 +1402,7 @@ while [ "$#" -gt 0 ]; do
+$OpenBSD: patch-configure,v 1.9 2007/05/22 09:09:32 espie Exp $
+--- configure.orig	Sun May  6 17:54:53 2007
++++ configure	Sun May 13 16:27:00 2007
+@@ -1556,7 +1556,7 @@ while [ "$#" -gt 0 ]; do
      v|verbose)
          if [ "$VAL" = "yes" ]; then
              if [ "$OPT_VERBOSE" = "$VAL" ]; then            # takes two verboses to turn on qmake debugs

x11/qt4/patches/patch-projects_pro

@@ -0,0 +1,12 @@
+$OpenBSD: patch-projects_pro,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- projects.pro.orig	Sun May 20 20:24:08 2007
++++ projects.pro	Sun May 20 20:24:26 2007
+@@ -107,7 +107,7 @@ INSTALLS += htmldocs
+ 
+ #translations
+ translations.path=$$[QT_INSTALL_TRANSLATIONS]
+-translations.files = $$QT_BUILD_TREE/translations/*.qm
++translations.files = $$QT_SOURCE_TREE/translations/*.qm
+ INSTALLS += translations
+ 
+ #qmake

x11/qt4/patches/patch-qmake_generators_unix_unixmake2_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
---- qmake/generators/unix/unixmake2.cpp.orig	Wed Feb 21 10:59:01 2007
-+++ qmake/generators/unix/unixmake2.cpp	Sat Mar 17 10:47:27 2007
-@@ -206,10 +206,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.5 2007/05/22 09:09:32 espie Exp $
+--- qmake/generators/unix/unixmake2.cpp.orig	Sun May  6 17:54:47 2007
++++ qmake/generators/unix/unixmake2.cpp	Sun May 13 16:27:00 2007
+@@ -213,10 +213,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
          } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
@@ -14,7 +14,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2007/03/17 17:58:17 es
          } else {
              t << "TARGETD       = " << escapeFilePath(var("TARGET_x")) << endl;
              t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -518,31 +516,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -526,31 +524,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
              t << endl << endl;
          } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
              t << "\n\t"
@@ -49,17 +49,18 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2007/03/17 17:58:17 es
              if(!project->isEmpty("QMAKE_POST_LINK"))
                  t << "\n\t" << var("QMAKE_POST_LINK");
              t << endl << endl;
-@@ -857,8 +846,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
-         t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
-     if(!project->isActiveConfig("staticlib") && project->values("QMAKE_APP_FLAG").isEmpty() &&
-        !project->isActiveConfig("plugin") && !project->isActiveConfig("compile_libtool"))
--        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
+@@ -843,9 +832,7 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+         t << "\t-$(LIBTOOL) --mode=clean $(DEL_FILE) " << "$(TARGET)" << endl;
+     } else if(!project->isActiveConfig("staticlib") && project->values("QMAKE_APP_FLAG").isEmpty() &&
+        !project->isActiveConfig("plugin")) {
+-        t << "\t-$(DEL_FILE) " << destdir << "$(TARGET)" << " " << endl
+-          << "\t-$(DEL_FILE) " << destdir << "$(TARGET0) " << destdir << "$(TARGET1) "
 -          << destdir << "$(TARGET2) $(TARGETA)" << endl;
-+        t << "\t-$(DEL_FILE) " << " $(TARGETA)" << endl;
-     {
-         QString ofile = Option::fixPathToTargetOS(fileFixify(Option::output.fileName()));
-         if(!ofile.isEmpty())
-@@ -927,6 +915,10 @@ void UnixMakefileGenerator::init2()
++        t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
+     } else {
+         t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
+     }
+@@ -943,6 +930,10 @@ void UnixMakefileGenerator::init2()
      project->values("VER_MAJ").append(l[0]);
      project->values("VER_MIN").append(l[1]);
      project->values("VER_PAT").append(l[2]);
@@ -70,7 +71,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.4 2007/03/17 17:58:17 es
      if(project->isEmpty("QMAKE_FRAMEWORK_VERSION"))
          project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first());
  
-@@ -1058,7 +1050,7 @@ void UnixMakefileGenerator::init2()
+@@ -1074,7 +1065,7 @@ void UnixMakefileGenerator::init2()
                                                              project->first("VER_MIN") +  "." +
                                                              project->first("VER_PAT"));
              }

x11/qt4/patches/patch-qmake_generators_unix_unixmake_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.5 2007/03/17 17:58:17 espie Exp $
---- qmake/generators/unix/unixmake.cpp.orig	Wed Feb 21 10:59:01 2007
-+++ qmake/generators/unix/unixmake.cpp	Sat Mar 17 10:47:27 2007
-@@ -634,7 +634,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
+$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.6 2007/05/22 09:09:32 espie Exp $
+--- qmake/generators/unix/unixmake.cpp.orig	Sun May  6 17:54:47 2007
++++ qmake/generators/unix/unixmake.cpp	Sun May 13 16:27:01 2007
+@@ -659,7 +659,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
          if(project->isEmpty("QMAKE_CYGWIN_SHLIB")) {
              if(!project->isActiveConfig("staticlib") && !project->isActiveConfig("plugin")) {
                  if(project->isEmpty("QMAKE_HPUX_SHLIB")) {

x11/qt4/patches/patch-src_corelib_codecs_qutfcodec_cpp

@@ -1,92 +0,0 @@
-$OpenBSD: patch-src_corelib_codecs_qutfcodec_cpp,v 1.1 2007/03/31 23:10:18 espie Exp $
---- src/corelib/codecs/qutfcodec.cpp.orig	Wed Feb 21 10:58:41 2007
-+++ src/corelib/codecs/qutfcodec.cpp	Sat Mar 31 15:01:10 2007
-@@ -127,15 +127,19 @@ QString QUtf8Codec::convertToUnicode(const char *chars
-     bool headerdone = false;
-     QChar replacement = QChar::ReplacementCharacter;
-     int need = 0;
-+    int error = -1;
-     uint uc = 0;
-+    uint min_uc = 0;
-     if (state) {
-         if (state->flags & IgnoreHeader)
-             headerdone = true;
-         if (state->flags & ConvertInvalidToNull)
-             replacement = QChar::Null;
-         need = state->remainingChars;
--        if (need)
-+        if (need) {
-             uc = state->state_data[0];
-+            min_uc = state->state_data[1];
-+        }
-     }
-     if (!headerdone && len > 3
-         && (uchar)chars[0] == 0xef && (uchar)chars[1] == 0xbb && (uchar)chars[2] == 0xbf) {
-@@ -152,7 +156,7 @@ QString QUtf8Codec::convertToUnicode(const char *chars
-     int invalid = 0;
- 
-     for (int i=0; i<len; i++) {
--        ch = *chars++;
-+        ch = chars[i];
-         if (need) {
-             if ((ch&0xc0) == 0x80) {
-                 uc = (uc << 6) | (ch & 0x3f);
-@@ -163,14 +167,27 @@ QString QUtf8Codec::convertToUnicode(const char *chars
-                         uc -= 0x10000;
-                         unsigned short high = uc/0x400 + 0xd800;
-                         unsigned short low = uc%0x400 + 0xdc00;
-+
-+                        // resize if necessary
-+                        long where = qch - result.unicode();
-+                        if (where + 2 >= result.size()) {
-+                            result.resize(where + 2);
-+                            qch = result.data() + where;
-+                        }
-+
-                         *qch++ = QChar(high);
-                         *qch++ = QChar(low);
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+                        // error
-+                        *qch++ = QChar::ReplacementCharacter;
-+                        ++invalid;
-                     } else {
-                         *qch++ = uc;
-                     }
-                 }
-             } else {
-                 // error
-+                i = error;
-                 *qch++ = QChar::ReplacementCharacter;
-                 ++invalid;
-                 need = 0;
-@@ -181,12 +198,22 @@ QString QUtf8Codec::convertToUnicode(const char *chars
-             } else if ((ch & 0xe0) == 0xc0) {
-                 uc = ch & 0x1f;
-                 need = 1;
-+                error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-+                error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-+                error = i;
-+                min_uc = 0x10000;
-+            } else {
-+                // error
-+                *qch++ = QChar::ReplacementCharacter;
-+                ++invalid;
-             }
-         }
-     }
-@@ -197,6 +224,7 @@ QString QUtf8Codec::convertToUnicode(const char *chars
-         if (headerdone)
-             state->flags |= IgnoreHeader;
-         state->state_data[0] = need ? uc : 0;
-+        state->state_data[1] = need ? min_uc : 0;
-     }
-     return result;
- }

x11/qt4/patches/patch-src_corelib_global_qglobal_h

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.1 2007/04/03 21:05:51 espie Exp $
---- src/corelib/global/qglobal.h.orig	Tue Apr  3 23:03:33 2007
-+++ src/corelib/global/qglobal.h	Tue Apr  3 23:06:04 2007
-@@ -1678,7 +1678,7 @@ typedef uint Flags;
+$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.2 2007/05/22 09:09:32 espie Exp $
+--- src/corelib/global/qglobal.h.orig	Sun May  6 17:54:22 2007
++++ src/corelib/global/qglobal.h	Sun May 13 16:27:01 2007
+@@ -1803,7 +1803,7 @@ typedef uint Flags;
  
  #endif /* Q_NO_TYPESAFE_FLAGS */
  

x11/qt4/patches/patch-src_corelib_io_io_pri

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_corelib_io_io_pri,v 1.1 2006/10/08 21:43:50 espie Exp $
---- src/corelib/io/io.pri.orig	Sun Oct  8 16:44:55 2006
-+++ src/corelib/io/io.pri	Sun Oct  8 16:45:06 2006
-@@ -60,7 +60,7 @@ win32 {
-             HEADERS += io/qfilesystemwatcher_inotify_p.h
-         }
- 
--        freebsd-*|macx-*:{
-+        freebsd-*|macx-*|openbsd-*:{
-             SOURCES += io/qfilesystemwatcher_kqueue.cpp
-             HEADERS += io/qfilesystemwatcher_kqueue_p.h
-         }

x11/qt4/patches/patch-src_corelib_io_qfsfileengine_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_corelib_io_qfsfileengine_cpp,v 1.2 2007/03/17 17:58:17 espie Exp $
---- src/corelib/io/qfsfileengine.cpp.orig	Wed Feb 21 10:58:42 2007
-+++ src/corelib/io/qfsfileengine.cpp	Sat Mar 17 10:47:27 2007
-@@ -481,7 +481,7 @@ qint64 QFSFileEngine::read(char *data, qint64 len)
-                         int readByte = 0;
-                         do {
-                             readByte = fgetc(d->fh);
--                        } while (readByte == -1 && errno == EINTR);
-+                        } while (readByte == -1 && !feof(d->fh) && errno == EINTR);
-                         if (readByte != -1) {
-                             *data = uchar(readByte);
-                             readBytes += 1;

x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp

@@ -1,28 +0,0 @@
-$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
---- src/corelib/io/qfsfileengine_unix.cpp.orig	Wed Feb 21 10:58:42 2007
-+++ src/corelib/io/qfsfileengine_unix.cpp	Sat Mar 17 10:47:27 2007
-@@ -580,13 +580,13 @@ uint QFSFileEngine::ownerId(FileOwner own) const
- 
- QString QFSFileEngine::owner(FileOwner own) const
- {
--#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-     QVarLengthArray<char, 1024> buf(sysconf(_SC_GETPW_R_SIZE_MAX));
- #endif
- 
-     if(own == OwnerUser) {
-         struct passwd *pw = 0;
--#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-         struct passwd entry;
-         getpwuid_r(ownerId(own), &entry, buf.data(), buf.size(), &pw);
- #else
-@@ -596,7 +596,7 @@ QString QFSFileEngine::owner(FileOwner own) const
-             return QFile::decodeName(QByteArray(pw->pw_name));
-     } else if(own == OwnerGroup) {
-         struct group *gr = 0;
--#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-         buf.resize(sysconf(_SC_GETGR_R_SIZE_MAX));
-         struct group entry;
-         getgrgid_r(ownerId(own), &entry, buf.data(), buf.size(), &gr);

x11/qt4/patches/patch-src_corelib_tools_qstring_cpp

@@ -1,42 +0,0 @@
-$OpenBSD: patch-src_corelib_tools_qstring_cpp,v 1.1 2007/03/31 23:10:18 espie Exp $
---- src/corelib/tools/qstring.cpp.orig	Wed Feb 21 10:58:43 2007
-+++ src/corelib/tools/qstring.cpp	Sat Mar 31 15:01:10 2007
-@@ -3352,6 +3352,7 @@ QString QString::fromUtf8(const char *str, int size)
-     result.resize(size); // worst case
-     ushort *qch = result.d->data;
-     uint uc = 0;
-+    uint min_uc = 0;
-     int need = 0;
-     int error = -1;
-     uchar ch;
-@@ -3369,6 +3370,12 @@ QString QString::fromUtf8(const char *str, int size)
-                         ushort low = uc%0x400 + 0xdc00;
-                         *qch++ = high;
-                         *qch++ = low;
-+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+			// overlong seqence, UTF16 surrogate or BOM
-+                        i = error;
-+                        qch = addOne(qch, result);
-+                        *qch++ = 0xdbff;
-+                        *qch++ = 0xde00 + ((uchar)str[i]);
-                     } else {
-                         *qch++ = uc;
-                     }
-@@ -3391,14 +3398,17 @@ QString QString::fromUtf8(const char *str, int size)
-                 uc = ch & 0x1f;
-                 need = 1;
-                 error = i;
-+                min_uc = 0x80;
-             } else if ((ch & 0xf0) == 0xe0) {
-                 uc = ch & 0x0f;
-                 need = 2;
-                 error = i;
-+                min_uc = 0x800;
-             } else if ((ch&0xf8) == 0xf0) {
-                 uc = ch & 0x07;
-                 need = 3;
-                 error = i;
-+                min_uc = 0x10000;
-             } else {
-                 // Error
-                 qch = addOne(qch, result);

x11/qt4/patches/patch-src_gui_dialogs_qprintdialog_unix_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gui_dialogs_qprintdialog_unix_cpp,v 1.4 2006/12/06 08:32:44 espie Exp $
---- src/gui/dialogs/qprintdialog_unix.cpp.orig	Mon Nov 27 18:26:11 2006
-+++ src/gui/dialogs/qprintdialog_unix.cpp	Wed Dec  6 01:16:13 2006
-@@ -58,6 +58,8 @@
- #    define BOOL_DEFINED
- #  endif
- 
-+#  include <sys/types.h>
-+#  include <rpc/rpc.h>
- #  include <rpcsvc/ypclnt.h>
- #  include <rpcsvc/yp_prot.h>
- #endif // QT_NO_NIS

x11/qt4/patches/patch-src_gui_kernel_qapplication_x11_cpp

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_gui_kernel_qapplication_x11_cpp,v 1.8 2007/03/17 17:58:17 espie Exp $
---- src/gui/kernel/qapplication_x11.cpp.orig	Wed Feb 21 10:58:48 2007
-+++ src/gui/kernel/qapplication_x11.cpp	Sat Mar 17 10:47:27 2007
-@@ -4715,7 +4715,7 @@ static void sm_performSaveYourself(QSessionManagerPriv
-     sm_setProperty(QString::fromLatin1(SmProgram), argument0);
-     // tell the session manager about our user as well.
-     struct passwd *entryPtr = 0;
--#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
-+#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
-     QVarLengthArray<char, 1024> buf(sysconf(_SC_GETPW_R_SIZE_MAX));
-     struct passwd entry;
-     getpwuid_r(geteuid(), &entry, buf.data(), buf.size(), &entryPtr);

x11/qt4/patches/patch-src_network_network_pro

@@ -0,0 +1,15 @@
+$OpenBSD: patch-src_network_network_pro,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/network.pro.orig	Mon May 21 01:43:02 2007
++++ src/network/network.pro	Mon May 21 01:43:25 2007
+@@ -74,11 +74,8 @@ contains(QT_CONFIG, openssl) {
+                qsslsocket_openssl.cpp \
+                qsslsocket_openssl_symbols.cpp
+ 
+-    # Only for static builds, we link against OpenSSL.
+-    contains(CONFIG, static) {
+         win32:LIBS += ssleay32 libeay32
+         unix:LIBS += -lssl -lcrypto
+-    }
+ 
+     # Include Qt's default CA bundle
+     RESOURCES += network.qrc

x11/qt4/patches/patch-src_network_qabstractsocket_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qabstractsocket_cpp,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qabstractsocket.cpp.orig	Mon May 21 17:51:39 2007
++++ src/network/qabstractsocket.cpp	Mon May 21 17:51:49 2007
+@@ -2302,7 +2302,7 @@ QNetworkProxy QAbstractSocket::proxy() const
+ */
+ #endif // QT3_SUPPORT
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, QAbstractSocket::SocketError error)
+ {
+     switch (error) {

x11/qt4/patches/patch-src_network_qabstractsocket_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qabstractsocket_h,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qabstractsocket.h.orig	Mon May 21 17:51:39 2007
++++ src/network/qabstractsocket.h	Mon May 21 17:52:03 2007
+@@ -201,7 +201,7 @@ Q_SIGNALS:
+ #endif
+ };
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include <QtCore/qdebug.h>
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QAbstractSocket::SocketError);
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QAbstractSocket::SocketState);

x11/qt4/patches/patch-src_network_qsslcertificate_cpp

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_network_qsslcertificate_cpp,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslcertificate.cpp.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslcertificate.cpp	Mon May 21 17:52:22 2007
+@@ -106,7 +106,7 @@
+ 
+ #include <QtCore/qatomic.h>
+ #include <QtCore/qdatetime.h>
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include <QtCore/qdebug.h>
+ #endif
+ #include <QtCore/qdir.h>
+@@ -670,7 +670,7 @@ QList<QSslCertificate> QSslCertificatePrivate::certifi
+     return certificates;
+ }
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ QDebug operator<<(QDebug debug, const QSslCertificate &certificate)
+ {
+     debug << "QSslCertificate("

x11/qt4/patches/patch-src_network_qsslcertificate_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qsslcertificate_h,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslcertificate.h.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslcertificate.h	Mon May 21 17:52:28 2007
+@@ -117,7 +117,7 @@ class Q_NETWORK_EXPORT QSslCertificate (private)
+     friend class QSslSocketBackendPrivate;
+ };
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ class QDebug;
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslCertificate &certificate);
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, QSslCertificate::SubjectInfo info);

x11/qt4/patches/patch-src_network_qsslcipher_cpp

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_network_qsslcipher_cpp,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslcipher.cpp.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslcipher.cpp	Mon May 21 17:52:38 2007
+@@ -67,7 +67,7 @@
+ #include "qsslcipher_p.h"
+ #include "qsslsocket.h"
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include <QtCore/qdebug.h>
+ #endif
+ 
+@@ -225,7 +225,7 @@ QSslCipher::Protocol QSslCipher::protocol() const
+     return d->protocol;
+ }
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ QDebug operator<<(QDebug debug, const QSslCipher &cipher)
+ {
+     debug << "QSslCipher(name=" << qPrintable(cipher.name())

x11/qt4/patches/patch-src_network_qsslcipher_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qsslcipher_h,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslcipher.h.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslcipher.h	Mon May 21 17:52:45 2007
+@@ -82,7 +82,7 @@ class Q_NETWORK_EXPORT QSslCipher (private)
+     friend class QSslSocketBackendPrivate;
+ };
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ class QDebug;
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslCipher &cipher);
+ #endif

x11/qt4/patches/patch-src_network_qsslerror_cpp

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_network_qsslerror_cpp,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslerror.cpp.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslerror.cpp	Mon May 21 17:52:54 2007
+@@ -86,7 +86,7 @@
+ */
+ 
+ #include "qsslerror.h"
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include <QtCore/qdebug.h>
+ #endif
+ 
+@@ -239,7 +239,7 @@ QSslCertificate QSslError::certificate() const
+     return d->certificate;
+ }
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ //class QDebug;
+ QDebug operator<<(QDebug debug, const QSslError &error)
+ {

x11/qt4/patches/patch-src_network_qsslerror_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qsslerror_h,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslerror.h.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslerror.h	Mon May 21 17:53:02 2007
+@@ -92,7 +92,7 @@ class Q_NETWORK_EXPORT QSslError (private)
+     QSslErrorPrivate *d;
+ };
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ class QDebug;
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslError &error);
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslError::SslError &error);

x11/qt4/patches/patch-src_network_qsslkey_cpp

@@ -0,0 +1,21 @@
+$OpenBSD: patch-src_network_qsslkey_cpp,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslkey.cpp.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslkey.cpp	Mon May 21 17:53:09 2007
+@@ -59,7 +59,7 @@
+ #include <QtCore/qatomic.h>
+ #include <QtCore/qbytearray.h>
+ #include <QtCore/qiodevice.h>
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ #include <QtCore/qdebug.h>
+ #endif
+ 
+@@ -448,7 +448,7 @@ bool QSslKey::operator==(const QSslKey &other) const
+     Returns true if this key is not equal to key \a other; otherwise returns false.
+ */
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ class QDebug;
+ QDebug operator<<(QDebug debug, const QSslKey &key)
+ {

x11/qt4/patches/patch-src_network_qsslkey_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qsslkey_h,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslkey.h.orig	Mon May 21 17:51:39 2007
++++ src/network/qsslkey.h	Mon May 21 17:53:15 2007
+@@ -90,7 +90,7 @@ class Q_NETWORK_EXPORT QSslKey (private)
+     friend class QSslCertificate;
+ };
+ 
+-#ifndef QT_NO_DEBUG
++#ifndef QT_NO_DEBUG_STREAM
+ class QDebug;
+ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslKey &key);
+ #endif

x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_cpp

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_cpp,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslsocket_openssl_symbols.cpp.orig	Mon May 21 01:44:12 2007
++++ src/network/qsslsocket_openssl_symbols.cpp	Mon May 21 01:44:25 2007
+@@ -188,7 +188,7 @@ DEFINEFUNC3(DSA *, d2i_DSAPrivateKey, DSA **a, a, unsi
+         qWarning("QSslSocket: cannot resolve "#func);
+ #endif
+ 
+-#ifdef QT_SHARED
++#if 0
+ 
+ #ifdef QT_NO_LIBRARY
+ bool q_resolveOpenSslSymbols()

x11/qt4/patches/patch-src_network_qsslsocket_openssl_symbols_p_h

@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_network_qsslsocket_openssl_symbols_p_h,v 1.1 2007/05/22 09:09:32 espie Exp $
+--- src/network/qsslsocket_openssl_symbols_p.h.orig	Mon May 21 01:44:35 2007
++++ src/network/qsslsocket_openssl_symbols_p.h	Mon May 21 01:44:44 2007
+@@ -54,7 +54,7 @@
+ 
+ #define DUMMYARG
+ 
+-#ifdef QT_SHARED
++#if 0
+ // **************** Shared declarations ******************
+ // ret func(arg)
+ 

x11/qt4/patches/patch-src_plugins_imageformats_mng_mng_pro

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_plugins_imageformats_mng_mng_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
---- src/plugins/imageformats/mng/mng.pro.orig	Sat Dec 31 16:31:31 2005
-+++ src/plugins/imageformats/mng/mng.pro	Sat Dec 31 16:31:47 2005
-@@ -9,7 +9,7 @@ SOURCES += main.cpp \
+$OpenBSD: patch-src_plugins_imageformats_mng_mng_pro,v 1.2 2007/05/22 09:09:32 espie Exp $
+--- src/plugins/imageformats/mng/mng.pro.orig	Mon Mar 19 21:15:21 2007
++++ src/plugins/imageformats/mng/mng.pro	Sat Apr 21 16:08:28 2007
+@@ -8,7 +8,7 @@ SOURCES += main.cpp \
             qmnghandler.cpp
  
  contains(QT_CONFIG, system-mng) {

x11/qt4/patches/patch-src_plugins_sqldrivers_sqlite_sqlite_pro

@@ -1,57 +0,0 @@
-$OpenBSD: patch-src_plugins_sqldrivers_sqlite_sqlite_pro,v 1.3 2007/03/17 17:58:17 espie Exp $
---- src/plugins/sqldrivers/sqlite/sqlite.pro.orig	Wed Feb 21 10:59:04 2007
-+++ src/plugins/sqldrivers/sqlite/sqlite.pro	Sat Mar 17 10:47:27 2007
-@@ -4,53 +4,7 @@ HEADERS		= ../../../sql/drivers/sqlite/qsql_sqlite.h
- SOURCES		= smain.cpp \
- 		  ../../../sql/drivers/sqlite/qsql_sqlite.cpp
- 
--!system-sqlite:!contains( LIBS, .*sqlite.* ) {
--    CONFIG(release, debug|release):DEFINES *= NDEBUG
--    INCLUDEPATH += ../../../3rdparty/sqlite
--
--    SOURCES += ../../../3rdparty/sqlite/alter.c \
--               ../../../3rdparty/sqlite/analyze.c \
--               ../../../3rdparty/sqlite/attach.c \
--               ../../../3rdparty/sqlite/auth.c \
--               ../../../3rdparty/sqlite/btree.c \
--               ../../../3rdparty/sqlite/build.c \
--               ../../../3rdparty/sqlite/callback.c \
--	       ../../../3rdparty/sqlite/date.c \
--               ../../../3rdparty/sqlite/delete.c \
--               ../../../3rdparty/sqlite/expr.c \
--               ../../../3rdparty/sqlite/func.c \
--               ../../../3rdparty/sqlite/hash.c \
--               ../../../3rdparty/sqlite/insert.c \
--               ../../../3rdparty/sqlite/legacy.c \
--               ../../../3rdparty/sqlite/main.c \
--               ../../../3rdparty/sqlite/opcodes.c \
--               ../../../3rdparty/sqlite/os.c \
--               ../../../3rdparty/sqlite/pager.c \
--               ../../../3rdparty/sqlite/parse.c \
--               ../../../3rdparty/sqlite/pragma.c \
--               ../../../3rdparty/sqlite/prepare.c \
--               ../../../3rdparty/sqlite/printf.c \
--               ../../../3rdparty/sqlite/random.c \
--               ../../../3rdparty/sqlite/select.c \
--               ../../../3rdparty/sqlite/table.c \
--               ../../../3rdparty/sqlite/tokenize.c \
--               ../../../3rdparty/sqlite/trigger.c \
--               ../../../3rdparty/sqlite/update.c \
--               ../../../3rdparty/sqlite/utf.c \
--               ../../../3rdparty/sqlite/util.c \
--               ../../../3rdparty/sqlite/vacuum.c \
--               ../../../3rdparty/sqlite/vdbeapi.c \
--	       ../../../3rdparty/sqlite/vdbeaux.c \
--               ../../../3rdparty/sqlite/vdbe.c \
--               ../../../3rdparty/sqlite/vdbefifo.c \
--               ../../../3rdparty/sqlite/vdbemem.c \
--               ../../../3rdparty/sqlite/where.c
--
--               unix:SOURCES += ../../../3rdparty/sqlite/os_unix.c
--               win32:SOURCES += ../../../3rdparty/sqlite/os_win.c
--} else {
-     LIBS *= $$QT_LFLAGS_SQLITE
-     QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE
--}
- 
- include(../qsqldriverbase.pri)

x11/qt4/patches/patch-src_qt3support_dialogs_q3filedialog_cpp

@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_qt3support_dialogs_q3filedialog_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
---- src/qt3support/dialogs/q3filedialog.cpp.orig	Wed Feb 21 10:58:50 2007
-+++ src/qt3support/dialogs/q3filedialog.cpp	Sat Mar 17 10:47:28 2007
-@@ -3113,6 +3113,9 @@ void Q3FileDialog::setDir(const QString & pathstr)
+$OpenBSD: patch-src_qt3support_dialogs_q3filedialog_cpp,v 1.5 2007/05/22 09:09:32 espie Exp $
+--- src/qt3support/dialogs/q3filedialog.cpp.orig	Sun May  6 17:54:34 2007
++++ src/qt3support/dialogs/q3filedialog.cpp	Sun May 13 16:27:01 2007
+@@ -3116,6 +3116,9 @@ void Q3FileDialog::setDir(const QString & pathstr)
  #    define _POSIX_LOGIN_NAME_MAX 9
  #  endif
  

x11/qt4/patches/patch-tools_assistant_lib_qassistantclient_cpp

@@ -1,17 +1,17 @@
-$OpenBSD: patch-tools_assistant_lib_qassistantclient_cpp,v 1.4 2007/03/17 17:58:17 espie Exp $
---- tools/assistant/lib/qassistantclient.cpp.orig	Wed Feb 21 10:58:51 2007
-+++ tools/assistant/lib/qassistantclient.cpp	Sat Mar 17 10:47:28 2007
+$OpenBSD: patch-tools_assistant_lib_qassistantclient_cpp,v 1.5 2007/05/22 09:09:32 espie Exp $
+--- tools/assistant/lib/qassistantclient.cpp.orig	Mon Mar 19 21:15:06 2007
++++ tools/assistant/lib/qassistantclient.cpp	Sat Apr 21 20:57:27 2007
 @@ -172,11 +172,11 @@ QAssistantClient::QAssistantClient( const QString &pat
-     : QObject( parent ), host ( "localhost" )
+     : QObject( parent ), host ( QLatin1String("localhost") )
  {
      if ( path.isEmpty() )
--        assistantCommand = "assistant";
-+        assistantCommand = "assistant4";
+-        assistantCommand = QLatin1String("assistant");
++        assistantCommand = QLatin1String("assistant4");
      else {
          QFileInfo fi( path );
          if ( fi.isDir() )
--            assistantCommand = path + "/assistant";
-+            assistantCommand = path + "/assistant4";
+-            assistantCommand = path + QLatin1String("/assistant");
++            assistantCommand = path + QLatin1String("/assistant4");
          else
              assistantCommand = path;
      }

x11/qt4/patches/patch-tools_qdbus_tools_qdbuscpp2xml_qdbuscpp2xml_cpp

@@ -1,12 +1,12 @@
-$OpenBSD: patch-tools_qdbus_tools_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.1 2007/02/24 11:23:49 espie Exp $
---- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp.orig	Sat Feb 24 12:25:55 2007
-+++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	Sat Feb 24 12:26:09 2007
-@@ -375,7 +375,7 @@ int main(int argc, char **argv)
+$OpenBSD: patch-tools_qdbus_tools_qdbuscpp2xml_qdbuscpp2xml_cpp,v 1.2 2007/05/22 09:09:32 espie Exp $
+--- tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp.orig	Sun May  6 17:54:54 2007
++++ tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp	Sun May 13 16:32:54 2007
+@@ -376,7 +376,7 @@ int main(int argc, char **argv)
          else {
              // run moc on this file
              QProcess proc;
--            proc.start(QLatin1String("moc"), QStringList() << QFile::decodeName(argv[i]));
-+            proc.start(QLatin1String("moc4"), QStringList() << QFile::decodeName(argv[i]));
+-            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
++            proc.start(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/moc4"), QStringList() << QFile::decodeName(argv[i]), QIODevice::ReadOnly | QIODevice::Text);
  
              if (!proc.waitForStarted()) {
                  fprintf(stderr, PROGRAMNAME ": could not execute moc! Aborting.\n");

x11/qt4/pkg/PFRAG.shared-examples

@@ -1,5 +1,7 @@
-@comment $OpenBSD: PFRAG.shared-examples,v 1.3 2006/10/30 18:17:32 espie Exp $
+@comment $OpenBSD: PFRAG.shared-examples,v 1.4 2007/05/22 09:09:32 espie Exp $
+lib/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
 lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
+lib/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so
 lib/qt4/plugins/designer/libarthurplugin.so
 lib/qt4/plugins/designer/libcontainerextension.so
 lib/qt4/plugins/designer/libcustomwidgetplugin.so

x11/qt4/pkg/PFRAG.shared-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/21 19:25:47 espie Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.2 2007/05/22 09:09:32 espie Exp $
 @lib lib/libQt3Support.so.${LIBQt3Support_VERSION}
 @lib lib/libQtAssistantClient.so.${LIBQtAssistantClient_VERSION}
 @lib lib/libQtCore.so.${LIBQtCore_VERSION}
@@ -8,6 +8,7 @@
 @lib lib/libQtGui.so.${LIBQtGui_VERSION}
 @lib lib/libQtNetwork.so.${LIBQtNetwork_VERSION}
 @lib lib/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
+@lib lib/libQtScript.so.${LIBQtScript_VERSION}
 @lib lib/libQtSql.so.${LIBQtSql_VERSION}
 @lib lib/libQtSvg.so.${LIBQtSvg_VERSION}
 @lib lib/libQtTest.so.${LIBQtTest_VERSION}
@@ -21,6 +22,7 @@
 @lib lib/qt4/libQtGui.so.${LIBQtGui_VERSION}
 @lib lib/qt4/libQtNetwork.so.${LIBQtNetwork_VERSION}
 @lib lib/qt4/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
+@lib lib/qt4/libQtScript.so.${LIBQtScript_VERSION}
 @lib lib/qt4/libQtSql.so.${LIBQtSql_VERSION}
 @lib lib/qt4/libQtSvg.so.${LIBQtSvg_VERSION}
 @lib lib/qt4/libQtTest.so.${LIBQtTest_VERSION}
@@ -37,4 +39,5 @@ lib/qt4/plugins/imageformats/libqgif.so
 lib/qt4/plugins/imageformats/libqjpeg.so
 lib/qt4/plugins/imageformats/libqmng.so
 lib/qt4/plugins/imageformats/libqsvg.so
+lib/qt4/plugins/imageformats/libqtiff.so
 lib/qt4/plugins/inputmethods/libqimsw-multi.so

x11/qt4/pkg/PLIST-examples

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.10 2007/03/17 17:58:17 espie Exp $
+@comment $OpenBSD: PLIST-examples,v 1.11 2007/05/22 09:09:32 espie Exp $
 @conflict qt4-<=4.2.2
 %%SHARED%%
 bin/pixeltool
@@ -70,14 +70,6 @@ lib/qt4/demos/composition/composition.pro
 lib/qt4/demos/composition/composition.qrc
 lib/qt4/demos/composition/flower_2.png
 lib/qt4/demos/composition/main.cpp
-lib/qt4/demos/dbus-viewer/
-lib/qt4/demos/dbus-viewer/dbus-viewer
-lib/qt4/demos/dbus-viewer/dbus-viewer.pro
-lib/qt4/demos/dbus-viewer/main.cpp
-lib/qt4/demos/dbus-viewer/qdbusmodel.cpp
-lib/qt4/demos/dbus-viewer/qdbusmodel.h
-lib/qt4/demos/dbus-viewer/qdbusviewer.cpp
-lib/qt4/demos/dbus-viewer/qdbusviewer.h
 lib/qt4/demos/deform/
 lib/qt4/demos/deform/deform
 lib/qt4/demos/deform/deform.pro
@@ -127,6 +119,59 @@ lib/qt4/demos/pathstroke/pathstroke.h
 lib/qt4/demos/pathstroke/pathstroke.html
 lib/qt4/demos/pathstroke/pathstroke.pro
 lib/qt4/demos/pathstroke/pathstroke.qrc
+lib/qt4/demos/qtdemo/
+lib/qt4/demos/qtdemo/colors.cpp
+lib/qt4/demos/qtdemo/colors.h
+lib/qt4/demos/qtdemo/demoitem.cpp
+lib/qt4/demos/qtdemo/demoitem.h
+lib/qt4/demos/qtdemo/demoitemanimation.cpp
+lib/qt4/demos/qtdemo/demoitemanimation.h
+lib/qt4/demos/qtdemo/demoscene.cpp
+lib/qt4/demos/qtdemo/demoscene.h
+lib/qt4/demos/qtdemo/demotextitem.cpp
+lib/qt4/demos/qtdemo/demotextitem.h
+lib/qt4/demos/qtdemo/dockitem.cpp
+lib/qt4/demos/qtdemo/dockitem.h
+lib/qt4/demos/qtdemo/examplecontent.cpp
+lib/qt4/demos/qtdemo/examplecontent.h
+lib/qt4/demos/qtdemo/guide.cpp
+lib/qt4/demos/qtdemo/guide.h
+lib/qt4/demos/qtdemo/guidecircle.cpp
+lib/qt4/demos/qtdemo/guidecircle.h
+lib/qt4/demos/qtdemo/guideline.cpp
+lib/qt4/demos/qtdemo/guideline.h
+lib/qt4/demos/qtdemo/headingitem.cpp
+lib/qt4/demos/qtdemo/headingitem.h
+lib/qt4/demos/qtdemo/imageitem.cpp
+lib/qt4/demos/qtdemo/imageitem.h
+lib/qt4/demos/qtdemo/images/
+lib/qt4/demos/qtdemo/images/demobg.png
+lib/qt4/demos/qtdemo/images/qtlogo_small.png
+lib/qt4/demos/qtdemo/images/trolltech-logo.png
+lib/qt4/demos/qtdemo/itemcircleanimation.cpp
+lib/qt4/demos/qtdemo/itemcircleanimation.h
+lib/qt4/demos/qtdemo/letteritem.cpp
+lib/qt4/demos/qtdemo/letteritem.h
+lib/qt4/demos/qtdemo/main.cpp
+lib/qt4/demos/qtdemo/mainwindow.cpp
+lib/qt4/demos/qtdemo/mainwindow.h
+lib/qt4/demos/qtdemo/menucontent.cpp
+lib/qt4/demos/qtdemo/menucontent.h
+lib/qt4/demos/qtdemo/menumanager.cpp
+lib/qt4/demos/qtdemo/menumanager.h
+lib/qt4/demos/qtdemo/qtdemo.icns
+lib/qt4/demos/qtdemo/qtdemo.ico
+lib/qt4/demos/qtdemo/qtdemo.pro
+lib/qt4/demos/qtdemo/qtdemo.qrc
+lib/qt4/demos/qtdemo/qtdemo.rc
+lib/qt4/demos/qtdemo/scanitem.cpp
+lib/qt4/demos/qtdemo/scanitem.h
+lib/qt4/demos/qtdemo/score.cpp
+lib/qt4/demos/qtdemo/score.h
+lib/qt4/demos/qtdemo/textbutton.cpp
+lib/qt4/demos/qtdemo/textbutton.h
+lib/qt4/demos/qtdemo/xml/
+lib/qt4/demos/qtdemo/xml/examples.xml
 lib/qt4/demos/shared/
 lib/qt4/demos/shared/arthurstyle.cpp
 lib/qt4/demos/shared/arthurstyle.h
@@ -251,6 +296,17 @@ lib/qt4/demos/textedit/textedit.doc
 lib/qt4/demos/textedit/textedit.h
 lib/qt4/demos/textedit/textedit.pro
 lib/qt4/demos/textedit/textedit.qrc
+lib/qt4/demos/undo/
+lib/qt4/demos/undo/commands.cpp
+lib/qt4/demos/undo/commands.h
+lib/qt4/demos/undo/document.cpp
+lib/qt4/demos/undo/document.h
+lib/qt4/demos/undo/main.cpp
+lib/qt4/demos/undo/mainwindow.cpp
+lib/qt4/demos/undo/mainwindow.h
+lib/qt4/demos/undo/undo
+lib/qt4/demos/undo/undo.pro
+lib/qt4/demos/undo/undo.qrc
 lib/qt4/examples/
 lib/qt4/examples/README
 lib/qt4/examples/assistant/
@@ -355,6 +411,12 @@ lib/qt4/examples/desktop/systray/window.cpp
 lib/qt4/examples/desktop/systray/window.h
 lib/qt4/examples/dialogs/
 lib/qt4/examples/dialogs/README
+lib/qt4/examples/dialogs/classwizard/
+lib/qt4/examples/dialogs/classwizard/classwizard
+lib/qt4/examples/dialogs/classwizard/classwizard.cpp
+lib/qt4/examples/dialogs/classwizard/classwizard.h
+lib/qt4/examples/dialogs/classwizard/classwizard.pro
+lib/qt4/examples/dialogs/classwizard/main.cpp
 lib/qt4/examples/dialogs/configdialog/
 lib/qt4/examples/dialogs/configdialog/configdialog
 lib/qt4/examples/dialogs/configdialog/configdialog.cpp
@@ -381,6 +443,12 @@ lib/qt4/examples/dialogs/findfiles/findfiles.pro
 lib/qt4/examples/dialogs/findfiles/main.cpp
 lib/qt4/examples/dialogs/findfiles/window.cpp
 lib/qt4/examples/dialogs/findfiles/window.h
+lib/qt4/examples/dialogs/licensewizard/
+lib/qt4/examples/dialogs/licensewizard/licensewizard
+lib/qt4/examples/dialogs/licensewizard/licensewizard.cpp
+lib/qt4/examples/dialogs/licensewizard/licensewizard.h
+lib/qt4/examples/dialogs/licensewizard/licensewizard.pro
+lib/qt4/examples/dialogs/licensewizard/main.cpp
 lib/qt4/examples/dialogs/standarddialogs/
 lib/qt4/examples/dialogs/standarddialogs/dialog.cpp
 lib/qt4/examples/dialogs/standarddialogs/dialog.h
@@ -393,6 +461,10 @@ lib/qt4/examples/dialogs/tabdialog/tabdialog
 lib/qt4/examples/dialogs/tabdialog/tabdialog.cpp
 lib/qt4/examples/dialogs/tabdialog/tabdialog.h
 lib/qt4/examples/dialogs/tabdialog/tabdialog.pro
+lib/qt4/examples/dialogs/trivialwizard/
+lib/qt4/examples/dialogs/trivialwizard/trivialwizard
+lib/qt4/examples/dialogs/trivialwizard/trivialwizard.cpp
+lib/qt4/examples/dialogs/trivialwizard/trivialwizard.pro
 lib/qt4/examples/draganddrop/
 lib/qt4/examples/draganddrop/README
 lib/qt4/examples/draganddrop/draganddrop.pro
@@ -706,6 +778,14 @@ lib/qt4/examples/itemviews/chart/mydata.cht
 lib/qt4/examples/itemviews/chart/pieview.cpp
 lib/qt4/examples/itemviews/chart/pieview.h
 lib/qt4/examples/itemviews/chart/qtdata.cht
+lib/qt4/examples/itemviews/coloreditorfactory/
+lib/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory
+lib/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
+lib/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.cpp
+lib/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.h
+lib/qt4/examples/itemviews/coloreditorfactory/main.cpp
+lib/qt4/examples/itemviews/coloreditorfactory/window.cpp
+lib/qt4/examples/itemviews/coloreditorfactory/window.h
 lib/qt4/examples/itemviews/customsortfiltermodel/
 lib/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel
 lib/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -764,6 +844,12 @@ lib/qt4/examples/itemviews/simpletreemodel/treeitem.cpp
 lib/qt4/examples/itemviews/simpletreemodel/treeitem.h
 lib/qt4/examples/itemviews/simpletreemodel/treemodel.cpp
 lib/qt4/examples/itemviews/simpletreemodel/treemodel.h
+lib/qt4/examples/itemviews/simplewidgetmapper/
+lib/qt4/examples/itemviews/simplewidgetmapper/main.cpp
+lib/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper
+lib/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+lib/qt4/examples/itemviews/simplewidgetmapper/window.cpp
+lib/qt4/examples/itemviews/simplewidgetmapper/window.h
 lib/qt4/examples/itemviews/spinboxdelegate/
 lib/qt4/examples/itemviews/spinboxdelegate/delegate.cpp
 lib/qt4/examples/itemviews/spinboxdelegate/delegate.h
@@ -957,6 +1043,7 @@ lib/qt4/examples/network/ftp/images/dir.png
 lib/qt4/examples/network/ftp/images/file.png
 lib/qt4/examples/network/ftp/main.cpp
 lib/qt4/examples/network/http/
+lib/qt4/examples/network/http/authenticationdialog.ui
 lib/qt4/examples/network/http/http
 lib/qt4/examples/network/http/http.pro
 lib/qt4/examples/network/http/httpwindow.cpp
@@ -1300,6 +1387,73 @@ lib/qt4/examples/richtext/syntaxhighlighter/mainwindow.cpp
 lib/qt4/examples/richtext/syntaxhighlighter/mainwindow.h
 lib/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter
 lib/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+lib/qt4/examples/script/
+lib/qt4/examples/script/README
+lib/qt4/examples/script/calculator/
+lib/qt4/examples/script/calculator/calculator
+lib/qt4/examples/script/calculator/calculator.pro
+lib/qt4/examples/script/calculator/calculator.qrc
+lib/qt4/examples/script/calculator/main.cpp
+lib/qt4/examples/script/context2d/
+lib/qt4/examples/script/context2d/context2d
+lib/qt4/examples/script/context2d/context2d.cpp
+lib/qt4/examples/script/context2d/context2d.h
+lib/qt4/examples/script/context2d/context2d.pro
+lib/qt4/examples/script/context2d/context2d.qrc
+lib/qt4/examples/script/context2d/domimage.cpp
+lib/qt4/examples/script/context2d/domimage.h
+lib/qt4/examples/script/context2d/main.cpp
+lib/qt4/examples/script/context2d/qcontext2dcanvas.cpp
+lib/qt4/examples/script/context2d/qcontext2dcanvas.h
+lib/qt4/examples/script/context2d/scripts/
+lib/qt4/examples/script/context2d/scripts/alpha.js
+lib/qt4/examples/script/context2d/scripts/arc.js
+lib/qt4/examples/script/context2d/scripts/bezier.js
+lib/qt4/examples/script/context2d/scripts/clock.js
+lib/qt4/examples/script/context2d/scripts/fill1.js
+lib/qt4/examples/script/context2d/scripts/grad.js
+lib/qt4/examples/script/context2d/scripts/image.js
+lib/qt4/examples/script/context2d/scripts/linecap.js
+lib/qt4/examples/script/context2d/scripts/linestye.js
+lib/qt4/examples/script/context2d/scripts/moveto.js
+lib/qt4/examples/script/context2d/scripts/moveto2.js
+lib/qt4/examples/script/context2d/scripts/pacman.js
+lib/qt4/examples/script/context2d/scripts/plasma.js
+lib/qt4/examples/script/context2d/scripts/pong.js
+lib/qt4/examples/script/context2d/scripts/quad.js
+lib/qt4/examples/script/context2d/scripts/rgba.js
+lib/qt4/examples/script/context2d/scripts/rotate.js
+lib/qt4/examples/script/context2d/scripts/scale.js
+lib/qt4/examples/script/context2d/scripts/stroke1.js
+lib/qt4/examples/script/context2d/scripts/translate.js
+lib/qt4/examples/script/context2d/window.cpp
+lib/qt4/examples/script/context2d/window.h
+lib/qt4/examples/script/defaultprototypes/
+lib/qt4/examples/script/defaultprototypes/defaultprototypes
+lib/qt4/examples/script/defaultprototypes/defaultprototypes.pro
+lib/qt4/examples/script/defaultprototypes/defaultprototypes.qrc
+lib/qt4/examples/script/defaultprototypes/main.cpp
+lib/qt4/examples/script/defaultprototypes/prototypes.cpp
+lib/qt4/examples/script/defaultprototypes/prototypes.h
+lib/qt4/examples/script/helloscript/
+lib/qt4/examples/script/helloscript/helloscript
+lib/qt4/examples/script/helloscript/helloscript.pro
+lib/qt4/examples/script/helloscript/main.cpp
+lib/qt4/examples/script/qscript/
+lib/qt4/examples/script/qscript/main.cpp
+lib/qt4/examples/script/qscript/qdbusbinding.cpp
+lib/qt4/examples/script/qscript/qdbusbinding.h
+lib/qt4/examples/script/qscript/qscript
+lib/qt4/examples/script/qscript/qscript.pro
+lib/qt4/examples/script/script.pro
+lib/qt4/examples/script/tetrix/
+lib/qt4/examples/script/tetrix/main.cpp
+lib/qt4/examples/script/tetrix/tetrix
+lib/qt4/examples/script/tetrix/tetrix.pro
+lib/qt4/examples/script/tetrix/tetrix.qrc
+lib/qt4/examples/script/tetrix/tetrixboard.cpp
+lib/qt4/examples/script/tetrix/tetrixboard.h
+lib/qt4/examples/script/tetrix/tetrixwindow.ui
 lib/qt4/examples/sql/
 lib/qt4/examples/sql/README
 lib/qt4/examples/sql/cachedtable/
@@ -1309,6 +1463,27 @@ lib/qt4/examples/sql/cachedtable/main.cpp
 lib/qt4/examples/sql/cachedtable/tableeditor.cpp
 lib/qt4/examples/sql/cachedtable/tableeditor.h
 lib/qt4/examples/sql/connection.h
+lib/qt4/examples/sql/drilldown/
+lib/qt4/examples/sql/drilldown/drilldown
+lib/qt4/examples/sql/drilldown/drilldown.pro
+lib/qt4/examples/sql/drilldown/drilldown.qrc
+lib/qt4/examples/sql/drilldown/imageitem.cpp
+lib/qt4/examples/sql/drilldown/imageitem.h
+lib/qt4/examples/sql/drilldown/informationwindow.cpp
+lib/qt4/examples/sql/drilldown/informationwindow.h
+lib/qt4/examples/sql/drilldown/main.cpp
+lib/qt4/examples/sql/drilldown/view.cpp
+lib/qt4/examples/sql/drilldown/view.h
+lib/qt4/examples/sql/masterdetail/
+lib/qt4/examples/sql/masterdetail/database.h
+lib/qt4/examples/sql/masterdetail/dialog.cpp
+lib/qt4/examples/sql/masterdetail/dialog.h
+lib/qt4/examples/sql/masterdetail/main.cpp
+lib/qt4/examples/sql/masterdetail/mainwindow.cpp
+lib/qt4/examples/sql/masterdetail/mainwindow.h
+lib/qt4/examples/sql/masterdetail/masterdetail
+lib/qt4/examples/sql/masterdetail/masterdetail.pro
+lib/qt4/examples/sql/masterdetail/masterdetail.qrc
 lib/qt4/examples/sql/querymodel/
 lib/qt4/examples/sql/querymodel/customsqlmodel.cpp
 lib/qt4/examples/sql/querymodel/customsqlmodel.h
@@ -1385,6 +1560,19 @@ lib/qt4/examples/tools/customcompleter/resources/
 lib/qt4/examples/tools/customcompleter/resources/wordlist.txt
 lib/qt4/examples/tools/customcompleter/textedit.cpp
 lib/qt4/examples/tools/customcompleter/textedit.h
+lib/qt4/examples/tools/echoplugin/
+lib/qt4/examples/tools/echoplugin/echoplugin.pro
+lib/qt4/examples/tools/echoplugin/echowindow/
+lib/qt4/examples/tools/echoplugin/echowindow/echointerface.h
+lib/qt4/examples/tools/echoplugin/echowindow/echowindow
+lib/qt4/examples/tools/echoplugin/echowindow/echowindow.cpp
+lib/qt4/examples/tools/echoplugin/echowindow/echowindow.h
+lib/qt4/examples/tools/echoplugin/echowindow/echowindow.pro
+lib/qt4/examples/tools/echoplugin/echowindow/main.cpp
+lib/qt4/examples/tools/echoplugin/plugin/
+lib/qt4/examples/tools/echoplugin/plugin/echoplugin.cpp
+lib/qt4/examples/tools/echoplugin/plugin/echoplugin.h
+lib/qt4/examples/tools/echoplugin/plugin/plugin.pro
 lib/qt4/examples/tools/i18n/
 lib/qt4/examples/tools/i18n/i18n
 lib/qt4/examples/tools/i18n/i18n.pro
@@ -1446,24 +1634,6 @@ lib/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
 lib/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
 lib/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h
 lib/qt4/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
-lib/qt4/examples/tools/qtdemo/
-lib/qt4/examples/tools/qtdemo/demos.xml
-lib/qt4/examples/tools/qtdemo/displayshape.cpp
-lib/qt4/examples/tools/qtdemo/displayshape.h
-lib/qt4/examples/tools/qtdemo/displaywidget.cpp
-lib/qt4/examples/tools/qtdemo/displaywidget.h
-lib/qt4/examples/tools/qtdemo/examples.xml
-lib/qt4/examples/tools/qtdemo/images/
-lib/qt4/examples/tools/qtdemo/images/qt4-logo.png
-lib/qt4/examples/tools/qtdemo/images/trolltech-logo.png
-lib/qt4/examples/tools/qtdemo/launcher.cpp
-lib/qt4/examples/tools/qtdemo/launcher.h
-lib/qt4/examples/tools/qtdemo/main.cpp
-lib/qt4/examples/tools/qtdemo/qtdemo.icns
-lib/qt4/examples/tools/qtdemo/qtdemo.ico
-lib/qt4/examples/tools/qtdemo/qtdemo.pro
-lib/qt4/examples/tools/qtdemo/qtdemo.qrc
-lib/qt4/examples/tools/qtdemo/qtdemo.rc
 lib/qt4/examples/tools/regexp/
 lib/qt4/examples/tools/regexp/main.cpp
 lib/qt4/examples/tools/regexp/regexp
@@ -1485,7 +1655,46 @@ lib/qt4/examples/tools/settingseditor/settingstree.cpp
 lib/qt4/examples/tools/settingseditor/settingstree.h
 lib/qt4/examples/tools/settingseditor/variantdelegate.cpp
 lib/qt4/examples/tools/settingseditor/variantdelegate.h
+lib/qt4/examples/tools/styleplugin/
+lib/qt4/examples/tools/styleplugin/plugin/
+lib/qt4/examples/tools/styleplugin/plugin/plugin.pro
+lib/qt4/examples/tools/styleplugin/plugin/simplestyle.cpp
+lib/qt4/examples/tools/styleplugin/plugin/simplestyle.h
+lib/qt4/examples/tools/styleplugin/plugin/simplestyleplugin.cpp
+lib/qt4/examples/tools/styleplugin/plugin/simplestyleplugin.h
+lib/qt4/examples/tools/styleplugin/styleplugin.pro
+lib/qt4/examples/tools/styleplugin/stylewindow/
+lib/qt4/examples/tools/styleplugin/stylewindow/main.cpp
+lib/qt4/examples/tools/styleplugin/stylewindow/styles/
+lib/qt4/examples/tools/styleplugin/stylewindow/stylewindow
+lib/qt4/examples/tools/styleplugin/stylewindow/stylewindow.cpp
+lib/qt4/examples/tools/styleplugin/stylewindow/stylewindow.h
+lib/qt4/examples/tools/styleplugin/stylewindow/stylewindow.pro
 lib/qt4/examples/tools/tools.pro
+lib/qt4/examples/tools/treemodelcompleter/
+lib/qt4/examples/tools/treemodelcompleter/main.cpp
+lib/qt4/examples/tools/treemodelcompleter/mainwindow.cpp
+lib/qt4/examples/tools/treemodelcompleter/mainwindow.h
+lib/qt4/examples/tools/treemodelcompleter/resources/
+lib/qt4/examples/tools/treemodelcompleter/resources/treemodel.txt
+lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter
+lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter.cpp
+lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter.h
+lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter.pro
+lib/qt4/examples/tools/treemodelcompleter/treemodelcompleter.qrc
+lib/qt4/examples/tools/undoframework/
+lib/qt4/examples/tools/undoframework/commands.cpp
+lib/qt4/examples/tools/undoframework/commands.h
+lib/qt4/examples/tools/undoframework/diagramitem.cpp
+lib/qt4/examples/tools/undoframework/diagramitem.h
+lib/qt4/examples/tools/undoframework/diagramscene.cpp
+lib/qt4/examples/tools/undoframework/diagramscene.h
+lib/qt4/examples/tools/undoframework/main.cpp
+lib/qt4/examples/tools/undoframework/mainwindow.cpp
+lib/qt4/examples/tools/undoframework/mainwindow.h
+lib/qt4/examples/tools/undoframework/undoframework
+lib/qt4/examples/tools/undoframework/undoframework.pro
+lib/qt4/examples/tools/undoframework/undoframework.qrc
 lib/qt4/examples/tutorial/
 lib/qt4/examples/tutorial/README
 lib/qt4/examples/tutorial/t1/
@@ -1772,6 +1981,12 @@ lib/qt4/examples/xml/dombookmarks/mainwindow.cpp
 lib/qt4/examples/xml/dombookmarks/mainwindow.h
 lib/qt4/examples/xml/dombookmarks/xbeltree.cpp
 lib/qt4/examples/xml/dombookmarks/xbeltree.h
+lib/qt4/examples/xml/rsslisting/
+lib/qt4/examples/xml/rsslisting/main.cpp
+lib/qt4/examples/xml/rsslisting/rsslisting
+lib/qt4/examples/xml/rsslisting/rsslisting.cpp
+lib/qt4/examples/xml/rsslisting/rsslisting.h
+lib/qt4/examples/xml/rsslisting/rsslisting.pro
 lib/qt4/examples/xml/saxbookmarks/
 lib/qt4/examples/xml/saxbookmarks/frank.xbel
 lib/qt4/examples/xml/saxbookmarks/jennifer.xbel
@@ -1785,3 +2000,7 @@ lib/qt4/examples/xml/saxbookmarks/xbelgenerator.h
 lib/qt4/examples/xml/saxbookmarks/xbelhandler.cpp
 lib/qt4/examples/xml/saxbookmarks/xbelhandler.h
 lib/qt4/examples/xml/xml.pro
+lib/qt4/examples/xml/xmlstreamlint/
+lib/qt4/examples/xml/xmlstreamlint/main.cpp
+lib/qt4/examples/xml/xmlstreamlint/xmlstreamlint
+lib/qt4/examples/xml/xmlstreamlint/xmlstreamlint.pro

x11/qt4/pkg/PLIST-html

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-html,v 1.9 2007/03/17 17:58:17 espie Exp $
+@comment $OpenBSD: PLIST-html,v 1.10 2007/05/22 09:09:32 espie Exp $
 share/doc/qt4/
 share/doc/qt4/html/
 share/doc/qt4/html/3rdparty.html
@@ -6,6 +6,7 @@ share/doc/qt4/html/aboutqt.html
 share/doc/qt4/html/abstractwidgets.html
 share/doc/qt4/html/accelerators.html
 share/doc/qt4/html/accessibility.html
+share/doc/qt4/html/accessible.html
 share/doc/qt4/html/activeqt-comapp-main-cpp.html
 share/doc/qt4/html/activeqt-comapp.html
 share/doc/qt4/html/activeqt-dotnet.html
@@ -39,6 +40,7 @@ share/doc/qt4/html/activeqt-simple.html
 share/doc/qt4/html/activeqt-testcon.html
 share/doc/qt4/html/activeqt-tools.html
 share/doc/qt4/html/activeqt-webbrowser-main-cpp.html
+share/doc/qt4/html/activeqt-webbrowser-webaxwidget-h.html
 share/doc/qt4/html/activeqt-webbrowser.html
 share/doc/qt4/html/activeqt-wrapper-main-cpp.html
 share/doc/qt4/html/activeqt-wrapper.html
@@ -58,7 +60,7 @@ share/doc/qt4/html/assistant-simpletextviewer-mainwindow-h.html
 share/doc/qt4/html/assistant-simpletextviewer.html
 share/doc/qt4/html/assistant.dcf
 share/doc/qt4/html/atomic-operations.html
-share/doc/qt4/html/basic.html
+share/doc/qt4/html/basicwidgets.html
 share/doc/qt4/html/bughowto.html
 share/doc/qt4/html/buildsystem.html
 share/doc/qt4/html/classes.html
@@ -75,6 +77,7 @@ share/doc/qt4/html/codecs-jis.html
 share/doc/qt4/html/codecs.html
 share/doc/qt4/html/commercialeditions.html
 share/doc/qt4/html/compatclasses.html
+share/doc/qt4/html/compiler-notes.html
 share/doc/qt4/html/console-edition-classes.html
 share/doc/qt4/html/containers.html
 share/doc/qt4/html/coordsys.html
@@ -159,6 +162,15 @@ share/doc/qt4/html/demos-textedit-textedit-cpp.html
 share/doc/qt4/html/demos-textedit-textedit-h.html
 share/doc/qt4/html/demos-textedit-textedit-qrc.html
 share/doc/qt4/html/demos-textedit.html
+share/doc/qt4/html/demos-undo-commands-cpp.html
+share/doc/qt4/html/demos-undo-commands-h.html
+share/doc/qt4/html/demos-undo-document-cpp.html
+share/doc/qt4/html/demos-undo-document-h.html
+share/doc/qt4/html/demos-undo-main-cpp.html
+share/doc/qt4/html/demos-undo-mainwindow-cpp.html
+share/doc/qt4/html/demos-undo-mainwindow-h.html
+share/doc/qt4/html/demos-undo-undo-qrc.html
+share/doc/qt4/html/demos-undo.html
 share/doc/qt4/html/demos.html
 share/doc/qt4/html/deployment-mac.html
 share/doc/qt4/html/deployment-windows.html
@@ -235,6 +247,11 @@ share/doc/qt4/html/desktop-systray-window-cpp.html
 share/doc/qt4/html/desktop-systray-window-h.html
 share/doc/qt4/html/desktop-systray.html
 share/doc/qt4/html/desktop.html
+share/doc/qt4/html/dialogs-classwizard-classwizard-cpp.html
+share/doc/qt4/html/dialogs-classwizard-classwizard-h.html
+share/doc/qt4/html/dialogs-classwizard-classwizard-qrc.html
+share/doc/qt4/html/dialogs-classwizard-main-cpp.html
+share/doc/qt4/html/dialogs-classwizard.html
 share/doc/qt4/html/dialogs-configdialog-configdialog-cpp.html
 share/doc/qt4/html/dialogs-configdialog-configdialog-h.html
 share/doc/qt4/html/dialogs-configdialog-configdialog-qrc.html
@@ -250,6 +267,11 @@ share/doc/qt4/html/dialogs-findfiles-main-cpp.html
 share/doc/qt4/html/dialogs-findfiles-window-cpp.html
 share/doc/qt4/html/dialogs-findfiles-window-h.html
 share/doc/qt4/html/dialogs-findfiles.html
+share/doc/qt4/html/dialogs-licensewizard-licensewizard-cpp.html
+share/doc/qt4/html/dialogs-licensewizard-licensewizard-h.html
+share/doc/qt4/html/dialogs-licensewizard-licensewizard-qrc.html
+share/doc/qt4/html/dialogs-licensewizard-main-cpp.html
+share/doc/qt4/html/dialogs-licensewizard.html
 share/doc/qt4/html/dialogs-standarddialogs-dialog-cpp.html
 share/doc/qt4/html/dialogs-standarddialogs-dialog-h.html
 share/doc/qt4/html/dialogs-standarddialogs-main-cpp.html
@@ -258,6 +280,8 @@ share/doc/qt4/html/dialogs-tabdialog-main-cpp.html
 share/doc/qt4/html/dialogs-tabdialog-tabdialog-cpp.html
 share/doc/qt4/html/dialogs-tabdialog-tabdialog-h.html
 share/doc/qt4/html/dialogs-tabdialog.html
+share/doc/qt4/html/dialogs-trivialwizard-trivialwizard-cpp.html
+share/doc/qt4/html/dialogs-trivialwizard.html
 share/doc/qt4/html/dialogs.html
 share/doc/qt4/html/dnd.html
 share/doc/qt4/html/draganddrop-draggableicons-draggableicons-qrc.html
@@ -295,6 +319,7 @@ share/doc/qt4/html/draganddrop-puzzle-puzzlewidget-cpp.html
 share/doc/qt4/html/draganddrop-puzzle-puzzlewidget-h.html
 share/doc/qt4/html/draganddrop-puzzle.html
 share/doc/qt4/html/draganddrop.html
+share/doc/qt4/html/ecmascript.html
 share/doc/qt4/html/editions.html
 share/doc/qt4/html/environment.html
 share/doc/qt4/html/events.html
@@ -309,6 +334,7 @@ share/doc/qt4/html/gallery-macintosh.html
 share/doc/qt4/html/gallery-motif.html
 share/doc/qt4/html/gallery-plastique.html
 share/doc/qt4/html/gallery-windows.html
+share/doc/qt4/html/gallery-windowsvista.html
 share/doc/qt4/html/gallery-windowsxp.html
 share/doc/qt4/html/gallery.html
 share/doc/qt4/html/geomanagement.html
@@ -319,6 +345,19 @@ share/doc/qt4/html/graphicsview-collidingmice-mice-qrc.html
 share/doc/qt4/html/graphicsview-collidingmice-mouse-cpp.html
 share/doc/qt4/html/graphicsview-collidingmice-mouse-h.html
 share/doc/qt4/html/graphicsview-collidingmice.html
+share/doc/qt4/html/graphicsview-diagramscene-arrow-cpp.html
+share/doc/qt4/html/graphicsview-diagramscene-arrow-h.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramitem-cpp.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramitem-h.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramscene-cpp.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramscene-h.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramscene-qrc.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramtextitem-cpp.html
+share/doc/qt4/html/graphicsview-diagramscene-diagramtextitem-h.html
+share/doc/qt4/html/graphicsview-diagramscene-main-cpp.html
+share/doc/qt4/html/graphicsview-diagramscene-mainwindow-cpp.html
+share/doc/qt4/html/graphicsview-diagramscene-mainwindow-h.html
+share/doc/qt4/html/graphicsview-diagramscene.html
 share/doc/qt4/html/graphicsview-dragdroprobot-coloritem-cpp.html
 share/doc/qt4/html/graphicsview-dragdroprobot-coloritem-h.html
 share/doc/qt4/html/graphicsview-dragdroprobot-main-cpp.html
@@ -366,6 +405,8 @@ share/doc/qt4/html/i18n.html
 share/doc/qt4/html/images/
 share/doc/qt4/html/images/2dpainting-example.png
 share/doc/qt4/html/images/abstract-connections.png
+share/doc/qt4/html/images/accessibilityarchitecture.png
+share/doc/qt4/html/images/accessibleobjecttree.png
 share/doc/qt4/html/images/affine-demo.png
 share/doc/qt4/html/images/alphachannelimage.png
 share/doc/qt4/html/images/alphafill.png
@@ -407,6 +448,7 @@ share/doc/qt4/html/images/calculator-ugly.png
 share/doc/qt4/html/images/calculatorbuilder-example.png
 share/doc/qt4/html/images/calculatorform-example.png
 share/doc/qt4/html/images/calendar-example.png
+share/doc/qt4/html/images/calendarwidgetexample.png
 share/doc/qt4/html/images/cde-calendarwidget.png
 share/doc/qt4/html/images/cde-checkbox.png
 share/doc/qt4/html/images/cde-combobox.png
@@ -438,13 +480,14 @@ share/doc/qt4/html/images/charactermap-example.png
 share/doc/qt4/html/images/chart-example.png
 share/doc/qt4/html/images/chat-example.png
 share/doc/qt4/html/images/chip-demo.png
+share/doc/qt4/html/images/classwizard-flow.png
+share/doc/qt4/html/images/classwizard.png
 share/doc/qt4/html/images/cleanlooks-calendarwidget.png
 share/doc/qt4/html/images/cleanlooks-checkbox.png
 share/doc/qt4/html/images/cleanlooks-combobox.png
 share/doc/qt4/html/images/cleanlooks-dateedit.png
 share/doc/qt4/html/images/cleanlooks-datetimeedit.png
 share/doc/qt4/html/images/cleanlooks-dial.png
-share/doc/qt4/html/images/cleanlooks-dialogbuttonbox.png
 share/doc/qt4/html/images/cleanlooks-doublespinbox.png
 share/doc/qt4/html/images/cleanlooks-fontcombobox.png
 share/doc/qt4/html/images/cleanlooks-frame.png
@@ -469,12 +512,14 @@ share/doc/qt4/html/images/cleanlooks-toolbutton.png
 share/doc/qt4/html/images/cleanlooks-treeview.png
 share/doc/qt4/html/images/codecs-example.png
 share/doc/qt4/html/images/collidingmice-example.png
+share/doc/qt4/html/images/coloreditorfactoryimage.png
 share/doc/qt4/html/images/completer-example.png
 share/doc/qt4/html/images/composition-demo.png
 share/doc/qt4/html/images/concentriccircles-example.png
 share/doc/qt4/html/images/configdialog-example.png
 share/doc/qt4/html/images/conicalGradient.png
 share/doc/qt4/html/images/containerextension-example.png
+share/doc/qt4/html/images/context2d-example.png
 share/doc/qt4/html/images/coordinatesystem-analogclock.png
 share/doc/qt4/html/images/coordinatesystem-line-antialias.png
 share/doc/qt4/html/images/coordinatesystem-line-raster.png
@@ -505,6 +550,7 @@ share/doc/qt4/html/images/customcompleter-example.png
 share/doc/qt4/html/images/customsortfiltermodel-example.png
 share/doc/qt4/html/images/customwidgetplugin-example.png
 share/doc/qt4/html/images/datetimewidgets.png
+share/doc/qt4/html/images/defaultprototypes-example.png
 share/doc/qt4/html/images/deform-demo.png
 share/doc/qt4/html/images/dependencies.png
 share/doc/qt4/html/images/deployment-mac-application.png
@@ -512,6 +558,7 @@ share/doc/qt4/html/images/deployment-mac-bundlestructure.png
 share/doc/qt4/html/images/deployment-windows-depends.png
 share/doc/qt4/html/images/designer-action-editor.png
 share/doc/qt4/html/images/designer-adding-dockwidget.png
+share/doc/qt4/html/images/designer-adding-dynamic-property.png
 share/doc/qt4/html/images/designer-adding-menu-action.png
 share/doc/qt4/html/images/designer-adding-toolbar-action.png
 share/doc/qt4/html/images/designer-buddy-making.png
@@ -532,6 +579,7 @@ share/doc/qt4/html/images/designer-containers-groupbox.png
 share/doc/qt4/html/images/designer-containers-stackedwidget.png
 share/doc/qt4/html/images/designer-containers-tabwidget.png
 share/doc/qt4/html/images/designer-containers-toolbox.png
+share/doc/qt4/html/images/designer-creating-dynamic-property.png
 share/doc/qt4/html/images/designer-creating-menu-entry1.png
 share/doc/qt4/html/images/designer-creating-menu-entry2.png
 share/doc/qt4/html/images/designer-creating-menu-entry3.png
@@ -571,6 +619,8 @@ share/doc/qt4/html/images/designer-tab-order-tool.png
 share/doc/qt4/html/images/designer-widget-box.png
 share/doc/qt4/html/images/designer-widget-tool.png
 share/doc/qt4/html/images/diagonalGradient.png
+share/doc/qt4/html/images/diagramscene.png
+share/doc/qt4/html/images/dialogbuttonboxexample.png
 share/doc/qt4/html/images/digitalclock-example.png
 share/doc/qt4/html/images/dirview-example.png
 share/doc/qt4/html/images/dockwidgets-example.png
@@ -579,7 +629,9 @@ share/doc/qt4/html/images/draganddroppuzzle-example.png
 share/doc/qt4/html/images/dragdroprobot-example.png
 share/doc/qt4/html/images/draggableicons-example.png
 share/doc/qt4/html/images/draggabletext-example.png
+share/doc/qt4/html/images/drilldown-example.png
 share/doc/qt4/html/images/dropsite-example.png
+share/doc/qt4/html/images/echopluginexample.png
 share/doc/qt4/html/images/elasticnodes-example.png
 share/doc/qt4/html/images/extension-example.png
 share/doc/qt4/html/images/extension_more.png
@@ -603,14 +655,13 @@ share/doc/qt4/html/images/graphicsview-ellipseitem-pie.png
 share/doc/qt4/html/images/graphicsview-ellipseitem.png
 share/doc/qt4/html/images/graphicsview-items.png
 share/doc/qt4/html/images/graphicsview-lineitem.png
-share/doc/qt4/html/images/graphicsview-map.png
 share/doc/qt4/html/images/graphicsview-parentchild.png
 share/doc/qt4/html/images/graphicsview-pathitem.png
 share/doc/qt4/html/images/graphicsview-pixmapitem.png
 share/doc/qt4/html/images/graphicsview-polygonitem.png
 share/doc/qt4/html/images/graphicsview-rectitem.png
-share/doc/qt4/html/images/graphicsview-shapes.png
-share/doc/qt4/html/images/graphicsview-text.png
+share/doc/qt4/html/images/graphicsview-simpletextitem.png
+share/doc/qt4/html/images/graphicsview-textitem.png
 share/doc/qt4/html/images/graphicsview-view.png
 share/doc/qt4/html/images/graphicsview-zorder.png
 share/doc/qt4/html/images/gridlayout.png
@@ -622,11 +673,11 @@ share/doc/qt4/html/images/i18n-example.png
 share/doc/qt4/html/images/icon.png
 share/doc/qt4/html/images/icons-example.png
 share/doc/qt4/html/images/icons-view-menu.png
-share/doc/qt4/html/images/icons_find_mess.png
 share/doc/qt4/html/images/icons_find_normal.png
 share/doc/qt4/html/images/icons_find_normal_disabled.png
 share/doc/qt4/html/images/icons_images_groupbox.png
 share/doc/qt4/html/images/icons_monkey.png
+share/doc/qt4/html/images/icons_monkey_active.png
 share/doc/qt4/html/images/icons_monkey_mess.png
 share/doc/qt4/html/images/icons_preview_area.png
 share/doc/qt4/html/images/icons_qtopia_16x16.png
@@ -652,6 +703,7 @@ share/doc/qt4/html/images/javaiterators1.png
 share/doc/qt4/html/images/javaiterators2.png
 share/doc/qt4/html/images/layout1.png
 share/doc/qt4/html/images/layout2.png
+share/doc/qt4/html/images/licensewizard-flow.png
 share/doc/qt4/html/images/lineedits-example.png
 share/doc/qt4/html/images/linguist-arrowpad_en.png
 share/doc/qt4/html/images/linguist-arrowpad_fr.png
@@ -714,17 +766,22 @@ share/doc/qt4/html/images/macintosh-timeedit.png
 share/doc/qt4/html/images/macintosh-toolbox.png
 share/doc/qt4/html/images/macintosh-toolbutton.png
 share/doc/qt4/html/images/macintosh-treeview.png
+share/doc/qt4/html/images/macintosh-unified-toolbar.png
+share/doc/qt4/html/images/mainwindow-custom-dock.png
 share/doc/qt4/html/images/mainwindow-demo.png
 share/doc/qt4/html/images/mainwindow-docks-example.png
 share/doc/qt4/html/images/mainwindow-docks.png
+share/doc/qt4/html/images/mainwindow-vertical-dock.png
+share/doc/qt4/html/images/mainwindow-vertical-tabs.png
 share/doc/qt4/html/images/mainwindowlayout.png
-share/doc/qt4/html/images/mandelbrot.png
+share/doc/qt4/html/images/mandelbrot-example.png
 share/doc/qt4/html/images/mandelbrot_scroll1.png
 share/doc/qt4/html/images/mandelbrot_scroll2.png
 share/doc/qt4/html/images/mandelbrot_scroll3.png
 share/doc/qt4/html/images/mandelbrot_zoom1.png
 share/doc/qt4/html/images/mandelbrot_zoom2.png
 share/doc/qt4/html/images/mandelbrot_zoom3.png
+share/doc/qt4/html/images/masterdetail-example.png
 share/doc/qt4/html/images/mdi-example.png
 share/doc/qt4/html/images/menus-example.png
 share/doc/qt4/html/images/modelindex-no-parent.png
@@ -797,9 +854,8 @@ share/doc/qt4/html/images/plastique-combobox.png
 share/doc/qt4/html/images/plastique-dateedit.png
 share/doc/qt4/html/images/plastique-datetimeedit.png
 share/doc/qt4/html/images/plastique-dial.png
-share/doc/qt4/html/images/plastique-dialogbuttonbox.png
 share/doc/qt4/html/images/plastique-doublespinbox.png
-share/doc/qt4/html/images/plastique-fontcombobox-open.png
+share/doc/qt4/html/images/plastique-filedialog.png
 share/doc/qt4/html/images/plastique-fontcombobox.png
 share/doc/qt4/html/images/plastique-fontdialog.png
 share/doc/qt4/html/images/plastique-frame.png
@@ -851,6 +907,7 @@ share/doc/qt4/html/images/qcolor-rgb.png
 share/doc/qt4/html/images/qcolor-saturation.png
 share/doc/qt4/html/images/qcolor-value.png
 share/doc/qt4/html/images/qconicalgradient.png
+share/doc/qt4/html/images/qdatawidgetmapper-simple.png
 share/doc/qt4/html/images/qdesktopwidget.png
 share/doc/qt4/html/images/qdockwindow.png
 share/doc/qt4/html/images/qerrormessage.png
@@ -881,6 +938,8 @@ share/doc/qt4/html/images/qmainwindow-qdockareas.png
 share/doc/qt4/html/images/qmatrix-combinedtransformation.png
 share/doc/qt4/html/images/qmatrix-representation.png
 share/doc/qt4/html/images/qmatrix-simpletransformation.png
+share/doc/qt4/html/images/qmdiarea-arrange.png
+share/doc/qt4/html/images/qmdisubwindowlayout.png
 share/doc/qt4/html/images/qmessagebox-crit.png
 share/doc/qt4/html/images/qmessagebox-info.png
 share/doc/qt4/html/images/qmessagebox-quest.png
@@ -974,7 +1033,6 @@ share/doc/qt4/html/images/qt-logo.png
 share/doc/qt4/html/images/qtableitems.png
 share/doc/qt4/html/images/qtabletevent-tilt.png
 share/doc/qt4/html/images/qtconfig-appearance.png
-share/doc/qt4/html/images/qtdemo-example.png
 share/doc/qt4/html/images/qtdesignerextensions.png
 share/doc/qt4/html/images/qtdesignerscreenshot.png
 share/doc/qt4/html/images/qtextblock-sequence.png
@@ -1005,6 +1063,18 @@ share/doc/qt4/html/images/qtopiacore-runningapplication.png
 share/doc/qt4/html/images/qtopiacore-setwindowattribute.png
 share/doc/qt4/html/images/qtopiacore-vanilla.png
 share/doc/qt4/html/images/qtopiacore-virtualframebuffer.png
+share/doc/qt4/html/images/qtscript-calculator.png
+share/doc/qt4/html/images/qtscript-context2d.png
+share/doc/qt4/html/images/qtwizard-aero1.png
+share/doc/qt4/html/images/qtwizard-aero2.png
+share/doc/qt4/html/images/qtwizard-classic1.png
+share/doc/qt4/html/images/qtwizard-classic2.png
+share/doc/qt4/html/images/qtwizard-mac1.png
+share/doc/qt4/html/images/qtwizard-mac2.png
+share/doc/qt4/html/images/qtwizard-macpage.png
+share/doc/qt4/html/images/qtwizard-modern1.png
+share/doc/qt4/html/images/qtwizard-modern2.png
+share/doc/qt4/html/images/qtwizard-nonmacpage.png
 share/doc/qt4/html/images/querymodel-example.png
 share/doc/qt4/html/images/qundoview.png
 share/doc/qt4/html/images/qurl-authority.png
@@ -1054,6 +1124,7 @@ share/doc/qt4/html/images/simpletextviewer-example.png
 share/doc/qt4/html/images/simpletextviewer-findfiledialog.png
 share/doc/qt4/html/images/simpletextviewer-mainwindow.png
 share/doc/qt4/html/images/simpletreemodel-example.png
+share/doc/qt4/html/images/simplewidgetmapper-example.png
 share/doc/qt4/html/images/sliders-example.png
 share/doc/qt4/html/images/spinboxdelegate-example.png
 share/doc/qt4/html/images/spinboxes-example.png
@@ -1061,8 +1132,10 @@ share/doc/qt4/html/images/spreadsheet-demo.png
 share/doc/qt4/html/images/sqlbrowser-demo.png
 share/doc/qt4/html/images/standard-views.png
 share/doc/qt4/html/images/standarddialogs-example.png
+share/doc/qt4/html/images/stardelegate.png
 share/doc/qt4/html/images/stliterators1.png
 share/doc/qt4/html/images/stringlistmodel.png
+share/doc/qt4/html/images/stylepluginexample.png
 share/doc/qt4/html/images/styles-3d.png
 share/doc/qt4/html/images/styles-aliasing.png
 share/doc/qt4/html/images/styles-disabledwood.png
@@ -1098,6 +1171,7 @@ share/doc/qt4/html/images/t9_1.png
 share/doc/qt4/html/images/t9_2.png
 share/doc/qt4/html/images/tabdialog-example.png
 share/doc/qt4/html/images/tablemodel-example.png
+share/doc/qt4/html/images/tabletexample.png
 share/doc/qt4/html/images/taskmenuextension-dialog.png
 share/doc/qt4/html/images/taskmenuextension-example-faded.png
 share/doc/qt4/html/images/taskmenuextension-menu.png
@@ -1111,10 +1185,14 @@ share/doc/qt4/html/images/tooltips-example.png
 share/doc/qt4/html/images/torrent-example.png
 share/doc/qt4/html/images/transformations-example.png
 share/doc/qt4/html/images/treemodel-structure.png
+share/doc/qt4/html/images/treemodelcompleter-example.png
 share/doc/qt4/html/images/trolltech-logo.png
 share/doc/qt4/html/images/tutorial8-layout.png
 share/doc/qt4/html/images/tutorial8-reallayout.png
 share/doc/qt4/html/images/udppackets.png
+share/doc/qt4/html/images/undodemo.png
+share/doc/qt4/html/images/undoframeworkexample.png
+share/doc/qt4/html/images/wVista-Cert-border-small.png
 share/doc/qt4/html/images/whatsthis.png
 share/doc/qt4/html/images/wiggly-example.png
 share/doc/qt4/html/images/windowflags-example.png
@@ -1147,6 +1225,33 @@ share/doc/qt4/html/images/windows-timeedit.png
 share/doc/qt4/html/images/windows-toolbox.png
 share/doc/qt4/html/images/windows-toolbutton.png
 share/doc/qt4/html/images/windows-treeview.png
+share/doc/qt4/html/images/windowsvista-calendarwidget.png
+share/doc/qt4/html/images/windowsvista-checkbox.png
+share/doc/qt4/html/images/windowsvista-combobox.png
+share/doc/qt4/html/images/windowsvista-dateedit.png
+share/doc/qt4/html/images/windowsvista-datetimeedit.png
+share/doc/qt4/html/images/windowsvista-dial.png
+share/doc/qt4/html/images/windowsvista-doublespinbox.png
+share/doc/qt4/html/images/windowsvista-fontcombobox.png
+share/doc/qt4/html/images/windowsvista-frame.png
+share/doc/qt4/html/images/windowsvista-groupbox.png
+share/doc/qt4/html/images/windowsvista-horizontalscrollbar.png
+share/doc/qt4/html/images/windowsvista-label.png
+share/doc/qt4/html/images/windowsvista-lcdnumber.png
+share/doc/qt4/html/images/windowsvista-lineedit.png
+share/doc/qt4/html/images/windowsvista-listview.png
+share/doc/qt4/html/images/windowsvista-progressbar.png
+share/doc/qt4/html/images/windowsvista-pushbutton.png
+share/doc/qt4/html/images/windowsvista-radiobutton.png
+share/doc/qt4/html/images/windowsvista-slider.png
+share/doc/qt4/html/images/windowsvista-spinbox.png
+share/doc/qt4/html/images/windowsvista-tableview.png
+share/doc/qt4/html/images/windowsvista-tabwidget.png
+share/doc/qt4/html/images/windowsvista-textedit.png
+share/doc/qt4/html/images/windowsvista-timeedit.png
+share/doc/qt4/html/images/windowsvista-toolbox.png
+share/doc/qt4/html/images/windowsvista-toolbutton.png
+share/doc/qt4/html/images/windowsvista-treeview.png
 share/doc/qt4/html/images/windowsxp-calendarwidget.png
 share/doc/qt4/html/images/windowsxp-checkbox.png
 share/doc/qt4/html/images/windowsxp-combobox.png
@@ -1198,6 +1303,12 @@ share/doc/qt4/html/itemviews-chart-mainwindow-h.html
 share/doc/qt4/html/itemviews-chart-pieview-cpp.html
 share/doc/qt4/html/itemviews-chart-pieview-h.html
 share/doc/qt4/html/itemviews-chart.html
+share/doc/qt4/html/itemviews-coloreditorfactory-colorlisteditor-cpp.html
+share/doc/qt4/html/itemviews-coloreditorfactory-colorlisteditor-h.html
+share/doc/qt4/html/itemviews-coloreditorfactory-main-cpp.html
+share/doc/qt4/html/itemviews-coloreditorfactory-window-cpp.html
+share/doc/qt4/html/itemviews-coloreditorfactory-window-h.html
+share/doc/qt4/html/itemviews-coloreditorfactory.html
 share/doc/qt4/html/itemviews-customsortfiltermodel-main-cpp.html
 share/doc/qt4/html/itemviews-customsortfiltermodel-mysortfilterproxymodel-cpp.html
 share/doc/qt4/html/itemviews-customsortfiltermodel-mysortfilterproxymodel-h.html
@@ -1239,10 +1350,22 @@ share/doc/qt4/html/itemviews-simpletreemodel-treeitem-h.html
 share/doc/qt4/html/itemviews-simpletreemodel-treemodel-cpp.html
 share/doc/qt4/html/itemviews-simpletreemodel-treemodel-h.html
 share/doc/qt4/html/itemviews-simpletreemodel.html
+share/doc/qt4/html/itemviews-simplewidgetmapper-main-cpp.html
+share/doc/qt4/html/itemviews-simplewidgetmapper-window-cpp.html
+share/doc/qt4/html/itemviews-simplewidgetmapper-window-h.html
+share/doc/qt4/html/itemviews-simplewidgetmapper.html
 share/doc/qt4/html/itemviews-spinboxdelegate-delegate-cpp.html
 share/doc/qt4/html/itemviews-spinboxdelegate-delegate-h.html
 share/doc/qt4/html/itemviews-spinboxdelegate-main-cpp.html
 share/doc/qt4/html/itemviews-spinboxdelegate.html
+share/doc/qt4/html/itemviews-stardelegate-main-cpp.html
+share/doc/qt4/html/itemviews-stardelegate-stardelegate-cpp.html
+share/doc/qt4/html/itemviews-stardelegate-stardelegate-h.html
+share/doc/qt4/html/itemviews-stardelegate-stareditor-cpp.html
+share/doc/qt4/html/itemviews-stardelegate-stareditor-h.html
+share/doc/qt4/html/itemviews-stardelegate-starrating-cpp.html
+share/doc/qt4/html/itemviews-stardelegate-starrating-h.html
+share/doc/qt4/html/itemviews-stardelegate.html
 share/doc/qt4/html/known-issues.html
 share/doc/qt4/html/layout.html
 share/doc/qt4/html/layouts-basiclayouts-dialog-cpp.html
@@ -1286,6 +1409,7 @@ share/doc/qt4/html/linguist-trollprint-mainwindow-h.html
 share/doc/qt4/html/linguist-trollprint-printpanel-cpp.html
 share/doc/qt4/html/linguist-trollprint-printpanel-h.html
 share/doc/qt4/html/linguist-trollprint.html
+share/doc/qt4/html/linguist-ts-file-format.html
 share/doc/qt4/html/linguist.dcf
 share/doc/qt4/html/mac-differences.html
 share/doc/qt4/html/mainclasses.html
@@ -1532,12 +1656,16 @@ share/doc/qt4/html/painting-transformations-window-h.html
 share/doc/qt4/html/painting-transformations.html
 share/doc/qt4/html/paintsystem.html
 share/doc/qt4/html/pdf-licensing.html
+share/doc/qt4/html/platform-notes-mac.html
+share/doc/qt4/html/platform-notes-windows.html
+share/doc/qt4/html/platform-notes-x11.html
 share/doc/qt4/html/platform-notes.html
 share/doc/qt4/html/plugins-howto.html
 share/doc/qt4/html/plugins.html
 share/doc/qt4/html/porting.html
 share/doc/qt4/html/porting4-designer.html
 share/doc/qt4/html/porting4-dnd.html
+share/doc/qt4/html/porting4-overview.html
 share/doc/qt4/html/porting4.html
 share/doc/qt4/html/printing.html
 share/doc/qt4/html/properties.html
@@ -1859,10 +1987,20 @@ share/doc/qt4/html/qabstractextensionfactory-members.html
 share/doc/qt4/html/qabstractextensionfactory.html
 share/doc/qt4/html/qabstractextensionmanager-members.html
 share/doc/qt4/html/qabstractextensionmanager.html
+share/doc/qt4/html/qabstractfileengine-extensionoption.html
+share/doc/qt4/html/qabstractfileengine-extensionreturn.html
 share/doc/qt4/html/qabstractfileengine-members.html
 share/doc/qt4/html/qabstractfileengine.html
 share/doc/qt4/html/qabstractfileenginehandler-members.html
 share/doc/qt4/html/qabstractfileenginehandler.html
+share/doc/qt4/html/qabstractfileengineiterator-members.html
+share/doc/qt4/html/qabstractfileengineiterator.html
+share/doc/qt4/html/qabstractfontengine-fixedpoint-members.html
+share/doc/qt4/html/qabstractfontengine-fixedpoint.html
+share/doc/qt4/html/qabstractfontengine-glyphmetrics-members.html
+share/doc/qt4/html/qabstractfontengine-glyphmetrics.html
+share/doc/qt4/html/qabstractfontengine-members.html
+share/doc/qt4/html/qabstractfontengine.html
 share/doc/qt4/html/qabstractformbuilder-members.html
 share/doc/qt4/html/qabstractformbuilder.html
 share/doc/qt4/html/qabstractgraphicsshapeitem-members.html
@@ -1929,6 +2067,8 @@ share/doc/qt4/html/qapplication-qt3.html
 share/doc/qt4/html/qapplication.html
 share/doc/qt4/html/qassistantclient-members.html
 share/doc/qt4/html/qassistantclient.html
+share/doc/qt4/html/qauthenticator-members.html
+share/doc/qt4/html/qauthenticator.html
 share/doc/qt4/html/qaxaggregated-members.html
 share/doc/qt4/html/qaxaggregated.html
 share/doc/qt4/html/qaxbase-members.html
@@ -1982,6 +2122,7 @@ share/doc/qt4/html/qcache-members.html
 share/doc/qt4/html/qcache-qt3.html
 share/doc/qt4/html/qcache.html
 share/doc/qt4/html/qcalendarwidget-members.html
+share/doc/qt4/html/qcalendarwidget-obsolete.html
 share/doc/qt4/html/qcalendarwidget.html
 share/doc/qt4/html/qcdestyle-members.html
 share/doc/qt4/html/qcdestyle.html
@@ -2002,6 +2143,7 @@ share/doc/qt4/html/qclipboard.html
 share/doc/qt4/html/qcloseevent-members.html
 share/doc/qt4/html/qcloseevent.html
 share/doc/qt4/html/qcolor-members.html
+share/doc/qt4/html/qcolor-obsolete.html
 share/doc/qt4/html/qcolor-qt3.html
 share/doc/qt4/html/qcolor.html
 share/doc/qt4/html/qcolordialog-members.html
@@ -2012,6 +2154,8 @@ share/doc/qt4/html/qcolorgroup-qt3.html
 share/doc/qt4/html/qcolorgroup.html
 share/doc/qt4/html/qcolormap-members.html
 share/doc/qt4/html/qcolormap.html
+share/doc/qt4/html/qcolumnview-members.html
+share/doc/qt4/html/qcolumnview.html
 share/doc/qt4/html/qcombobox-members.html
 share/doc/qt4/html/qcombobox-obsolete.html
 share/doc/qt4/html/qcombobox-qt3.html
@@ -2034,6 +2178,8 @@ share/doc/qt4/html/qcopchannel.html
 share/doc/qt4/html/qcoreapplication-members.html
 share/doc/qt4/html/qcoreapplication-qt3.html
 share/doc/qt4/html/qcoreapplication.html
+share/doc/qt4/html/qcryptographichash-members.html
+share/doc/qt4/html/qcryptographichash.html
 share/doc/qt4/html/qcursor-members.html
 share/doc/qt4/html/qcursor.html
 share/doc/qt4/html/qcustomevent-members.html
@@ -2069,6 +2215,8 @@ share/doc/qt4/html/qdbusconnection-members.html
 share/doc/qt4/html/qdbusconnection.html
 share/doc/qt4/html/qdbusconnectioninterface-members.html
 share/doc/qt4/html/qdbusconnectioninterface.html
+share/doc/qt4/html/qdbuscontext-members.html
+share/doc/qt4/html/qdbuscontext.html
 share/doc/qt4/html/qdbusdeclaringsignals.html
 share/doc/qt4/html/qdbusdeclaringslots.html
 share/doc/qt4/html/qdbuserror-members.html
@@ -2088,6 +2236,7 @@ share/doc/qt4/html/qdbussignature.html
 share/doc/qt4/html/qdbustypesystem.html
 share/doc/qt4/html/qdbusvariant-members.html
 share/doc/qt4/html/qdbusvariant.html
+share/doc/qt4/html/qdbusviewer.html
 share/doc/qt4/html/qdbusxml2cpp.html
 share/doc/qt4/html/qdecoration-members.html
 share/doc/qt4/html/qdecoration.html
@@ -2103,6 +2252,8 @@ share/doc/qt4/html/qdesignercustomwidgetcollectioninterface-members.html
 share/doc/qt4/html/qdesignercustomwidgetcollectioninterface.html
 share/doc/qt4/html/qdesignercustomwidgetinterface-members.html
 share/doc/qt4/html/qdesignercustomwidgetinterface.html
+share/doc/qt4/html/qdesignerdynamicpropertysheetextension-members.html
+share/doc/qt4/html/qdesignerdynamicpropertysheetextension.html
 share/doc/qt4/html/qdesignerformeditorinterface-members.html
 share/doc/qt4/html/qdesignerformeditorinterface.html
 share/doc/qt4/html/qdesignerformwindowcursorinterface-members.html
@@ -2119,6 +2270,8 @@ share/doc/qt4/html/qdesignerpropertyeditorinterface-members.html
 share/doc/qt4/html/qdesignerpropertyeditorinterface.html
 share/doc/qt4/html/qdesignerpropertysheetextension-members.html
 share/doc/qt4/html/qdesignerpropertysheetextension.html
+share/doc/qt4/html/qdesignerscriptextension-members.html
+share/doc/qt4/html/qdesignerscriptextension.html
 share/doc/qt4/html/qdesignertaskmenuextension-members.html
 share/doc/qt4/html/qdesignertaskmenuextension.html
 share/doc/qt4/html/qdesignerwidgetboxinterface-members.html
@@ -2143,6 +2296,8 @@ share/doc/qt4/html/qdir.html
 share/doc/qt4/html/qdirectpainter-members.html
 share/doc/qt4/html/qdirectpainter-obsolete.html
 share/doc/qt4/html/qdirectpainter.html
+share/doc/qt4/html/qdiriterator-members.html
+share/doc/qt4/html/qdiriterator.html
 share/doc/qt4/html/qdirmodel-members.html
 share/doc/qt4/html/qdirmodel.html
 share/doc/qt4/html/qdockwidget-members.html
@@ -2187,6 +2342,7 @@ share/doc/qt4/html/qdoublevalidator-members.html
 share/doc/qt4/html/qdoublevalidator-qt3.html
 share/doc/qt4/html/qdoublevalidator.html
 share/doc/qt4/html/qdrag-members.html
+share/doc/qt4/html/qdrag-obsolete.html
 share/doc/qt4/html/qdrag.html
 share/doc/qt4/html/qdragenterevent-members.html
 share/doc/qt4/html/qdragenterevent.html
@@ -2246,6 +2402,10 @@ share/doc/qt4/html/qfontdatabase-members.html
 share/doc/qt4/html/qfontdatabase.html
 share/doc/qt4/html/qfontdialog-members.html
 share/doc/qt4/html/qfontdialog.html
+share/doc/qt4/html/qfontengineinfo-members.html
+share/doc/qt4/html/qfontengineinfo.html
+share/doc/qt4/html/qfontengineplugin-members.html
+share/doc/qt4/html/qfontengineplugin.html
 share/doc/qt4/html/qfontinfo-members.html
 share/doc/qt4/html/qfontinfo.html
 share/doc/qt4/html/qfontmetrics-members.html
@@ -2283,11 +2443,14 @@ share/doc/qt4/html/qglwidget-members.html
 share/doc/qt4/html/qglwidget-obsolete.html
 share/doc/qt4/html/qglwidget-qt3.html
 share/doc/qt4/html/qglwidget.html
+share/doc/qt4/html/qglwindowsurface-members.html
+share/doc/qt4/html/qglwindowsurface.html
 share/doc/qt4/html/qgradient-members.html
 share/doc/qt4/html/qgradient.html
 share/doc/qt4/html/qgraphicsellipseitem-members.html
 share/doc/qt4/html/qgraphicsellipseitem.html
 share/doc/qt4/html/qgraphicsitem-members.html
+share/doc/qt4/html/qgraphicsitem-obsolete.html
 share/doc/qt4/html/qgraphicsitem.html
 share/doc/qt4/html/qgraphicsitemanimation-members.html
 share/doc/qt4/html/qgraphicsitemanimation.html
@@ -2368,6 +2531,7 @@ share/doc/qt4/html/qhttprequestheader.html
 share/doc/qt4/html/qhttpresponseheader-members.html
 share/doc/qt4/html/qhttpresponseheader.html
 share/doc/qt4/html/qicon-members.html
+share/doc/qt4/html/qicon-obsolete.html
 share/doc/qt4/html/qicon-qt3.html
 share/doc/qt4/html/qicon.html
 share/doc/qt4/html/qicondragevent-members.html
@@ -2376,6 +2540,10 @@ share/doc/qt4/html/qiconengine-members.html
 share/doc/qt4/html/qiconengine.html
 share/doc/qt4/html/qiconengineplugin-members.html
 share/doc/qt4/html/qiconengineplugin.html
+share/doc/qt4/html/qiconenginepluginv2-members.html
+share/doc/qt4/html/qiconenginepluginv2.html
+share/doc/qt4/html/qiconenginev2-members.html
+share/doc/qt4/html/qiconenginev2.html
 share/doc/qt4/html/qimage-members.html
 share/doc/qt4/html/qimage-obsolete.html
 share/doc/qt4/html/qimage-qt3.html
@@ -2413,6 +2581,8 @@ share/doc/qt4/html/qiodevice-qt3.html
 share/doc/qt4/html/qiodevice.html
 share/doc/qt4/html/qitemdelegate-members.html
 share/doc/qt4/html/qitemdelegate.html
+share/doc/qt4/html/qitemeditorcreator-members.html
+share/doc/qt4/html/qitemeditorcreator.html
 share/doc/qt4/html/qitemeditorcreatorbase-members.html
 share/doc/qt4/html/qitemeditorcreatorbase.html
 share/doc/qt4/html/qitemeditorfactory-members.html
@@ -2442,6 +2612,7 @@ share/doc/qt4/html/qlatin1char.html
 share/doc/qt4/html/qlatin1string-members.html
 share/doc/qt4/html/qlatin1string.html
 share/doc/qt4/html/qlayout-members.html
+share/doc/qt4/html/qlayout-obsolete.html
 share/doc/qt4/html/qlayout-qt3.html
 share/doc/qt4/html/qlayout.html
 share/doc/qt4/html/qlayoutitem-members.html
@@ -2494,6 +2665,7 @@ share/doc/qt4/html/qlocale.html
 share/doc/qt4/html/qmacpasteboardmime-members.html
 share/doc/qt4/html/qmacpasteboardmime.html
 share/doc/qt4/html/qmacstyle-members.html
+share/doc/qt4/html/qmacstyle-obsolete.html
 share/doc/qt4/html/qmacstyle.html
 share/doc/qt4/html/qmainwindow-members.html
 share/doc/qt4/html/qmainwindow-qt3.html
@@ -2526,6 +2698,10 @@ share/doc/qt4/html/qmapiterator.html
 share/doc/qt4/html/qmatrix-members.html
 share/doc/qt4/html/qmatrix-qt3.html
 share/doc/qt4/html/qmatrix.html
+share/doc/qt4/html/qmdiarea-members.html
+share/doc/qt4/html/qmdiarea.html
+share/doc/qt4/html/qmdisubwindow-members.html
+share/doc/qt4/html/qmdisubwindow.html
 share/doc/qt4/html/qmenu-members.html
 share/doc/qt4/html/qmenu-qt3.html
 share/doc/qt4/html/qmenu.html
@@ -2645,6 +2821,7 @@ share/doc/qt4/html/qpictureformatplugin.html
 share/doc/qt4/html/qpictureio-members.html
 share/doc/qt4/html/qpictureio.html
 share/doc/qt4/html/qpixmap-members.html
+share/doc/qt4/html/qpixmap-obsolete.html
 share/doc/qt4/html/qpixmap-qt3.html
 share/doc/qt4/html/qpixmap.html
 share/doc/qt4/html/qpixmapcache-members.html
@@ -2717,6 +2894,7 @@ share/doc/qt4/html/qregion.html
 share/doc/qt4/html/qresizeevent-members.html
 share/doc/qt4/html/qresizeevent.html
 share/doc/qt4/html/qresource-members.html
+share/doc/qt4/html/qresource-obsolete.html
 share/doc/qt4/html/qresource.html
 share/doc/qt4/html/qrubberband-members.html
 share/doc/qt4/html/qrubberband.html
@@ -2728,6 +2906,18 @@ share/doc/qt4/html/qscreendriverfactory-members.html
 share/doc/qt4/html/qscreendriverfactory.html
 share/doc/qt4/html/qscreendriverplugin-members.html
 share/doc/qt4/html/qscreendriverplugin.html
+share/doc/qt4/html/qscriptable-members.html
+share/doc/qt4/html/qscriptable.html
+share/doc/qt4/html/qscriptcontext-members.html
+share/doc/qt4/html/qscriptcontext.html
+share/doc/qt4/html/qscriptengine-members.html
+share/doc/qt4/html/qscriptengine.html
+share/doc/qt4/html/qscriptextensionplugin-members.html
+share/doc/qt4/html/qscriptextensionplugin.html
+share/doc/qt4/html/qscriptvalue-members.html
+share/doc/qt4/html/qscriptvalue.html
+share/doc/qt4/html/qscriptvalueiterator-members.html
+share/doc/qt4/html/qscriptvalueiterator.html
 share/doc/qt4/html/qscrollarea-members.html
 share/doc/qt4/html/qscrollarea.html
 share/doc/qt4/html/qscrollbar-members.html
@@ -2781,6 +2971,7 @@ share/doc/qt4/html/qsocketnotifier-members.html
 share/doc/qt4/html/qsocketnotifier-qt3.html
 share/doc/qt4/html/qsocketnotifier.html
 share/doc/qt4/html/qsortfilterproxymodel-members.html
+share/doc/qt4/html/qsortfilterproxymodel-obsolete.html
 share/doc/qt4/html/qsortfilterproxymodel.html
 share/doc/qt4/html/qsound-members.html
 share/doc/qt4/html/qsound-qt3.html
@@ -2839,6 +3030,17 @@ share/doc/qt4/html/qsqlresult-members.html
 share/doc/qt4/html/qsqlresult.html
 share/doc/qt4/html/qsqltablemodel-members.html
 share/doc/qt4/html/qsqltablemodel.html
+share/doc/qt4/html/qssl.html
+share/doc/qt4/html/qsslcertificate-members.html
+share/doc/qt4/html/qsslcertificate.html
+share/doc/qt4/html/qsslcipher-members.html
+share/doc/qt4/html/qsslcipher.html
+share/doc/qt4/html/qsslerror-members.html
+share/doc/qt4/html/qsslerror.html
+share/doc/qt4/html/qsslkey-members.html
+share/doc/qt4/html/qsslkey.html
+share/doc/qt4/html/qsslsocket-members.html
+share/doc/qt4/html/qsslsocket.html
 share/doc/qt4/html/qstack-members.html
 share/doc/qt4/html/qstack.html
 share/doc/qt4/html/qstackedlayout-members.html
@@ -2867,7 +3069,10 @@ share/doc/qt4/html/qstringlistmodel-members.html
 share/doc/qt4/html/qstringlistmodel.html
 share/doc/qt4/html/qstringmatcher-members.html
 share/doc/qt4/html/qstringmatcher.html
+share/doc/qt4/html/qstringref-members.html
+share/doc/qt4/html/qstringref.html
 share/doc/qt4/html/qstyle-members.html
+share/doc/qt4/html/qstyle-obsolete.html
 share/doc/qt4/html/qstyle.html
 share/doc/qt4/html/qstylefactory-members.html
 share/doc/qt4/html/qstylefactory.html
@@ -2875,6 +3080,8 @@ share/doc/qt4/html/qstylehintreturn-members.html
 share/doc/qt4/html/qstylehintreturn.html
 share/doc/qt4/html/qstylehintreturnmask-members.html
 share/doc/qt4/html/qstylehintreturnmask.html
+share/doc/qt4/html/qstylehintreturnvariant-members.html
+share/doc/qt4/html/qstylehintreturnvariant.html
 share/doc/qt4/html/qstyleoption-members.html
 share/doc/qt4/html/qstyleoption-obsolete.html
 share/doc/qt4/html/qstyleoption.html
@@ -2932,6 +3139,8 @@ share/doc/qt4/html/qstyleoptiontoolbar-members.html
 share/doc/qt4/html/qstyleoptiontoolbar.html
 share/doc/qt4/html/qstyleoptiontoolbox-members.html
 share/doc/qt4/html/qstyleoptiontoolbox.html
+share/doc/qt4/html/qstyleoptiontoolboxv2-members.html
+share/doc/qt4/html/qstyleoptiontoolboxv2.html
 share/doc/qt4/html/qstyleoptiontoolbutton-members.html
 share/doc/qt4/html/qstyleoptiontoolbutton.html
 share/doc/qt4/html/qstyleoptionviewitem-members.html
@@ -2942,6 +3151,8 @@ share/doc/qt4/html/qstylepainter-members.html
 share/doc/qt4/html/qstylepainter.html
 share/doc/qt4/html/qstyleplugin-members.html
 share/doc/qt4/html/qstyleplugin.html
+share/doc/qt4/html/qsvggenerator-members.html
+share/doc/qt4/html/qsvggenerator.html
 share/doc/qt4/html/qsvgrenderer-members.html
 share/doc/qt4/html/qsvgrenderer.html
 share/doc/qt4/html/qsvgwidget-members.html
@@ -2961,7 +3172,7 @@ share/doc/qt4/html/qt.html
 share/doc/qt4/html/qt3support.html
 share/doc/qt4/html/qt3to4-treewalker.html
 share/doc/qt4/html/qt3to4.html
-share/doc/qt4/html/qt4-2-intro.html
+share/doc/qt4/html/qt4-3-intro.html
 share/doc/qt4/html/qt4-accessibility.html
 share/doc/qt4/html/qt4-arthur.html
 share/doc/qt4/html/qt4-designer.html
@@ -3032,6 +3243,7 @@ share/doc/qt4/html/qtextbrowser-members.html
 share/doc/qt4/html/qtextbrowser-qt3.html
 share/doc/qt4/html/qtextbrowser.html
 share/doc/qt4/html/qtextcharformat-members.html
+share/doc/qt4/html/qtextcharformat-obsolete.html
 share/doc/qt4/html/qtextcharformat.html
 share/doc/qt4/html/qtextcodec-converterstate-members.html
 share/doc/qt4/html/qtextcodec-converterstate.html
@@ -3172,6 +3384,8 @@ share/doc/qt4/html/qtopiacore-testingframebuffer.html
 share/doc/qt4/html/qtopiacore-vnc.html
 share/doc/qt4/html/qtopiacore.html
 share/doc/qt4/html/qtplugin.html
+share/doc/qt4/html/qtransform-members.html
+share/doc/qt4/html/qtransform.html
 share/doc/qt4/html/qtranslator-members.html
 share/doc/qt4/html/qtranslator-qt3.html
 share/doc/qt4/html/qtranslator.html
@@ -3186,6 +3400,8 @@ share/doc/qt4/html/qtreewidgetitem-obsolete.html
 share/doc/qt4/html/qtreewidgetitem.html
 share/doc/qt4/html/qtreewidgetitemiterator-members.html
 share/doc/qt4/html/qtreewidgetitemiterator.html
+share/doc/qt4/html/qtscript.html
+share/doc/qt4/html/qtscriptextensions.html
 share/doc/qt4/html/qtsql.html
 share/doc/qt4/html/qtsvg.html
 share/doc/qt4/html/qttest.html
@@ -3228,6 +3444,8 @@ share/doc/qt4/html/qvector-members.html
 share/doc/qt4/html/qvector.html
 share/doc/qt4/html/qvectoriterator-members.html
 share/doc/qt4/html/qvectoriterator.html
+share/doc/qt4/html/qvncscreen-members.html
+share/doc/qt4/html/qvncscreen.html
 share/doc/qt4/html/qwaitcondition-members.html
 share/doc/qt4/html/qwaitcondition.html
 share/doc/qt4/html/qwhatsthis-members.html
@@ -3252,8 +3470,14 @@ share/doc/qt4/html/qwindowsstyle-members.html
 share/doc/qt4/html/qwindowsstyle.html
 share/doc/qt4/html/qwindowstatechangeevent-members.html
 share/doc/qt4/html/qwindowstatechangeevent.html
+share/doc/qt4/html/qwindowsvistastyle-members.html
+share/doc/qt4/html/qwindowsvistastyle.html
 share/doc/qt4/html/qwindowsxpstyle-members.html
 share/doc/qt4/html/qwindowsxpstyle.html
+share/doc/qt4/html/qwizard-members.html
+share/doc/qt4/html/qwizard.html
+share/doc/qt4/html/qwizardpage-members.html
+share/doc/qt4/html/qwizardpage.html
 share/doc/qt4/html/qworkspace-members.html
 share/doc/qt4/html/qworkspace-qt3.html
 share/doc/qt4/html/qworkspace.html
@@ -3287,8 +3511,6 @@ share/doc/qt4/html/qwsserver-qt3.html
 share/doc/qt4/html/qwsserver.html
 share/doc/qt4/html/qwswindow-members.html
 share/doc/qt4/html/qwswindow.html
-share/doc/qt4/html/qwswindowsurface-members.html
-share/doc/qt4/html/qwswindowsurface.html
 share/doc/qt4/html/qx11embedcontainer-members.html
 share/doc/qt4/html/qx11embedcontainer.html
 share/doc/qt4/html/qx11embedwidget-members.html
@@ -3325,6 +3547,20 @@ share/doc/qt4/html/qxmlreader-obsolete.html
 share/doc/qt4/html/qxmlreader.html
 share/doc/qt4/html/qxmlsimplereader-members.html
 share/doc/qt4/html/qxmlsimplereader.html
+share/doc/qt4/html/qxmlstreamattribute-members.html
+share/doc/qt4/html/qxmlstreamattribute.html
+share/doc/qt4/html/qxmlstreamattributes-members.html
+share/doc/qt4/html/qxmlstreamattributes.html
+share/doc/qt4/html/qxmlstreamentitydeclaration-members.html
+share/doc/qt4/html/qxmlstreamentitydeclaration.html
+share/doc/qt4/html/qxmlstreamnamespacedeclaration-members.html
+share/doc/qt4/html/qxmlstreamnamespacedeclaration.html
+share/doc/qt4/html/qxmlstreamnotationdeclaration-members.html
+share/doc/qt4/html/qxmlstreamnotationdeclaration.html
+share/doc/qt4/html/qxmlstreamreader-members.html
+share/doc/qt4/html/qxmlstreamreader.html
+share/doc/qt4/html/qxmlstreamwriter-members.html
+share/doc/qt4/html/qxmlstreamwriter.html
 share/doc/qt4/html/rcc.html
 share/doc/qt4/html/resources.html
 share/doc/qt4/html/richtext-advanced-processing.html
@@ -3349,6 +3585,59 @@ share/doc/qt4/html/richtext-syntaxhighlighter-mainwindow-cpp.html
 share/doc/qt4/html/richtext-syntaxhighlighter-mainwindow-h.html
 share/doc/qt4/html/richtext-syntaxhighlighter.html
 share/doc/qt4/html/richtext.html
+share/doc/qt4/html/script-calculator-calculator-js.html
+share/doc/qt4/html/script-calculator-calculator-qrc.html
+share/doc/qt4/html/script-calculator-main-cpp.html
+share/doc/qt4/html/script-calculator.html
+share/doc/qt4/html/script-context2d-context2d-cpp.html
+share/doc/qt4/html/script-context2d-context2d-h.html
+share/doc/qt4/html/script-context2d-context2d-qrc.html
+share/doc/qt4/html/script-context2d-domimage-cpp.html
+share/doc/qt4/html/script-context2d-domimage-h.html
+share/doc/qt4/html/script-context2d-main-cpp.html
+share/doc/qt4/html/script-context2d-qcontext2dcanvas-cpp.html
+share/doc/qt4/html/script-context2d-qcontext2dcanvas-h.html
+share/doc/qt4/html/script-context2d-scripts-alpha-js.html
+share/doc/qt4/html/script-context2d-scripts-arc-js.html
+share/doc/qt4/html/script-context2d-scripts-bezier-js.html
+share/doc/qt4/html/script-context2d-scripts-clock-js.html
+share/doc/qt4/html/script-context2d-scripts-fill1-js.html
+share/doc/qt4/html/script-context2d-scripts-grad-js.html
+share/doc/qt4/html/script-context2d-scripts-image-js.html
+share/doc/qt4/html/script-context2d-scripts-linecap-js.html
+share/doc/qt4/html/script-context2d-scripts-linestye-js.html
+share/doc/qt4/html/script-context2d-scripts-moveto-js.html
+share/doc/qt4/html/script-context2d-scripts-moveto2-js.html
+share/doc/qt4/html/script-context2d-scripts-pacman-js.html
+share/doc/qt4/html/script-context2d-scripts-plasma-js.html
+share/doc/qt4/html/script-context2d-scripts-pong-js.html
+share/doc/qt4/html/script-context2d-scripts-quad-js.html
+share/doc/qt4/html/script-context2d-scripts-rgba-js.html
+share/doc/qt4/html/script-context2d-scripts-rotate-js.html
+share/doc/qt4/html/script-context2d-scripts-scale-js.html
+share/doc/qt4/html/script-context2d-scripts-stroke1-js.html
+share/doc/qt4/html/script-context2d-scripts-translate-js.html
+share/doc/qt4/html/script-context2d-window-cpp.html
+share/doc/qt4/html/script-context2d-window-h.html
+share/doc/qt4/html/script-context2d.html
+share/doc/qt4/html/script-defaultprototypes-code-js.html
+share/doc/qt4/html/script-defaultprototypes-defaultprototypes-qrc.html
+share/doc/qt4/html/script-defaultprototypes-main-cpp.html
+share/doc/qt4/html/script-defaultprototypes-prototypes-cpp.html
+share/doc/qt4/html/script-defaultprototypes-prototypes-h.html
+share/doc/qt4/html/script-defaultprototypes.html
+share/doc/qt4/html/script-helloscript-main-cpp.html
+share/doc/qt4/html/script-helloscript.html
+share/doc/qt4/html/script-tetrix-main-cpp.html
+share/doc/qt4/html/script-tetrix-tetrix-qrc.html
+share/doc/qt4/html/script-tetrix-tetrixboard-cpp.html
+share/doc/qt4/html/script-tetrix-tetrixboard-h.html
+share/doc/qt4/html/script-tetrix-tetrixboard-js.html
+share/doc/qt4/html/script-tetrix-tetrixpiece-js.html
+share/doc/qt4/html/script-tetrix-tetrixwindow-js.html
+share/doc/qt4/html/script-tetrix.html
+share/doc/qt4/html/script.html
+share/doc/qt4/html/scripting.html
 share/doc/qt4/html/session.html
 share/doc/qt4/html/shared.html
 share/doc/qt4/html/signalsandslots.html
@@ -3356,7 +3645,24 @@ share/doc/qt4/html/sql-cachedtable-main-cpp.html
 share/doc/qt4/html/sql-cachedtable-tableeditor-cpp.html
 share/doc/qt4/html/sql-cachedtable-tableeditor-h.html
 share/doc/qt4/html/sql-cachedtable.html
+share/doc/qt4/html/sql-drilldown-drilldown-qrc.html
+share/doc/qt4/html/sql-drilldown-imageitem-cpp.html
+share/doc/qt4/html/sql-drilldown-imageitem-h.html
+share/doc/qt4/html/sql-drilldown-informationwindow-cpp.html
+share/doc/qt4/html/sql-drilldown-informationwindow-h.html
+share/doc/qt4/html/sql-drilldown-main-cpp.html
+share/doc/qt4/html/sql-drilldown-view-cpp.html
+share/doc/qt4/html/sql-drilldown-view-h.html
+share/doc/qt4/html/sql-drilldown.html
 share/doc/qt4/html/sql-driver.html
+share/doc/qt4/html/sql-masterdetail-database-h.html
+share/doc/qt4/html/sql-masterdetail-dialog-cpp.html
+share/doc/qt4/html/sql-masterdetail-dialog-h.html
+share/doc/qt4/html/sql-masterdetail-main-cpp.html
+share/doc/qt4/html/sql-masterdetail-mainwindow-cpp.html
+share/doc/qt4/html/sql-masterdetail-mainwindow-h.html
+share/doc/qt4/html/sql-masterdetail-masterdetail-qrc.html
+share/doc/qt4/html/sql-masterdetail.html
 share/doc/qt4/html/sql-querymodel-customsqlmodel-cpp.html
 share/doc/qt4/html/sql-querymodel-customsqlmodel-h.html
 share/doc/qt4/html/sql-querymodel-editablesqlmodel-cpp.html
@@ -3368,7 +3674,9 @@ share/doc/qt4/html/sql-relationaltablemodel.html
 share/doc/qt4/html/sql-tablemodel-tablemodel-cpp.html
 share/doc/qt4/html/sql-tablemodel.html
 share/doc/qt4/html/stylesheet.html
+share/doc/qt4/html/supported-platforms.html
 share/doc/qt4/html/templates.html
+share/doc/qt4/html/text-processing.html
 share/doc/qt4/html/text.html
 share/doc/qt4/html/thread.html
 share/doc/qt4/html/threads-mandelbrot-main-cpp.html
@@ -3404,6 +3712,13 @@ share/doc/qt4/html/tools-customcompleter-mainwindow-h.html
 share/doc/qt4/html/tools-customcompleter-textedit-cpp.html
 share/doc/qt4/html/tools-customcompleter-textedit-h.html
 share/doc/qt4/html/tools-customcompleter.html
+share/doc/qt4/html/tools-echoplugin-echowindow-echointerface-h.html
+share/doc/qt4/html/tools-echoplugin-echowindow-echowindow-cpp.html
+share/doc/qt4/html/tools-echoplugin-echowindow-echowindow-h.html
+share/doc/qt4/html/tools-echoplugin-echowindow-main-cpp.html
+share/doc/qt4/html/tools-echoplugin-plugin-echoplugin-cpp.html
+share/doc/qt4/html/tools-echoplugin-plugin-echoplugin-h.html
+share/doc/qt4/html/tools-echoplugin.html
 share/doc/qt4/html/tools-i18n-i18n-qrc.html
 share/doc/qt4/html/tools-i18n-languagechooser-cpp.html
 share/doc/qt4/html/tools-i18n-languagechooser-h.html
@@ -3426,15 +3741,6 @@ share/doc/qt4/html/tools-plugandpaintplugins-basictools.html
 share/doc/qt4/html/tools-plugandpaintplugins-extrafilters-extrafiltersplugin-cpp.html
 share/doc/qt4/html/tools-plugandpaintplugins-extrafilters-extrafiltersplugin-h.html
 share/doc/qt4/html/tools-plugandpaintplugins-extrafilters.html
-share/doc/qt4/html/tools-qtdemo-displayshape-cpp.html
-share/doc/qt4/html/tools-qtdemo-displayshape-h.html
-share/doc/qt4/html/tools-qtdemo-displaywidget-cpp.html
-share/doc/qt4/html/tools-qtdemo-displaywidget-h.html
-share/doc/qt4/html/tools-qtdemo-launcher-cpp.html
-share/doc/qt4/html/tools-qtdemo-launcher-h.html
-share/doc/qt4/html/tools-qtdemo-main-cpp.html
-share/doc/qt4/html/tools-qtdemo-qtdemo-qrc.html
-share/doc/qt4/html/tools-qtdemo.html
 share/doc/qt4/html/tools-regexp-main-cpp.html
 share/doc/qt4/html/tools-regexp-regexpdialog-cpp.html
 share/doc/qt4/html/tools-regexp-regexpdialog-h.html
@@ -3449,6 +3755,32 @@ share/doc/qt4/html/tools-settingseditor-settingstree-h.html
 share/doc/qt4/html/tools-settingseditor-variantdelegate-cpp.html
 share/doc/qt4/html/tools-settingseditor-variantdelegate-h.html
 share/doc/qt4/html/tools-settingseditor.html
+share/doc/qt4/html/tools-styleplugin-plugin-simplestyle-cpp.html
+share/doc/qt4/html/tools-styleplugin-plugin-simplestyle-h.html
+share/doc/qt4/html/tools-styleplugin-plugin-simplestyleplugin-cpp.html
+share/doc/qt4/html/tools-styleplugin-plugin-simplestyleplugin-h.html
+share/doc/qt4/html/tools-styleplugin-stylewindow-main-cpp.html
+share/doc/qt4/html/tools-styleplugin-stylewindow-stylewindow-cpp.html
+share/doc/qt4/html/tools-styleplugin-stylewindow-stylewindow-h.html
+share/doc/qt4/html/tools-styleplugin.html
+share/doc/qt4/html/tools-treemodelcompleter-main-cpp.html
+share/doc/qt4/html/tools-treemodelcompleter-mainwindow-cpp.html
+share/doc/qt4/html/tools-treemodelcompleter-mainwindow-h.html
+share/doc/qt4/html/tools-treemodelcompleter-treemodelcompleter-cpp.html
+share/doc/qt4/html/tools-treemodelcompleter-treemodelcompleter-h.html
+share/doc/qt4/html/tools-treemodelcompleter-treemodelcompleter-qrc.html
+share/doc/qt4/html/tools-treemodelcompleter.html
+share/doc/qt4/html/tools-undoframework-commands-cpp.html
+share/doc/qt4/html/tools-undoframework-commands-h.html
+share/doc/qt4/html/tools-undoframework-diagramitem-cpp.html
+share/doc/qt4/html/tools-undoframework-diagramitem-h.html
+share/doc/qt4/html/tools-undoframework-diagramscene-cpp.html
+share/doc/qt4/html/tools-undoframework-diagramscene-h.html
+share/doc/qt4/html/tools-undoframework-main-cpp.html
+share/doc/qt4/html/tools-undoframework-mainwindow-cpp.html
+share/doc/qt4/html/tools-undoframework-mainwindow-h.html
+share/doc/qt4/html/tools-undoframework-undoframework-qrc.html
+share/doc/qt4/html/tools-undoframework.html
 share/doc/qt4/html/tools.html
 share/doc/qt4/html/topics.html
 share/doc/qt4/html/trademarks.html
@@ -3529,12 +3861,22 @@ share/doc/qt4/html/widgets-calculator-calculator-cpp.html
 share/doc/qt4/html/widgets-calculator-calculator-h.html
 share/doc/qt4/html/widgets-calculator-main-cpp.html
 share/doc/qt4/html/widgets-calculator.html
+share/doc/qt4/html/widgets-calendarwidget-main-cpp.html
+share/doc/qt4/html/widgets-calendarwidget-window-cpp.html
+share/doc/qt4/html/widgets-calendarwidget-window-h.html
+share/doc/qt4/html/widgets-calendarwidget.html
 share/doc/qt4/html/widgets-charactermap-characterwidget-cpp.html
 share/doc/qt4/html/widgets-charactermap-characterwidget-h.html
 share/doc/qt4/html/widgets-charactermap-main-cpp.html
 share/doc/qt4/html/widgets-charactermap-mainwindow-cpp.html
 share/doc/qt4/html/widgets-charactermap-mainwindow-h.html
 share/doc/qt4/html/widgets-charactermap.html
+share/doc/qt4/html/widgets-dialogbuttonbox-addbuttondialog-cpp.html
+share/doc/qt4/html/widgets-dialogbuttonbox-addbuttondialog-h.html
+share/doc/qt4/html/widgets-dialogbuttonbox-main-cpp.html
+share/doc/qt4/html/widgets-dialogbuttonbox-mainwindow-cpp.html
+share/doc/qt4/html/widgets-dialogbuttonbox-mainwindow-h.html
+share/doc/qt4/html/widgets-dialogbuttonbox.html
 share/doc/qt4/html/widgets-digitalclock-digitalclock-cpp.html
 share/doc/qt4/html/widgets-digitalclock-digitalclock-h.html
 share/doc/qt4/html/widgets-digitalclock-main-cpp.html
@@ -3600,6 +3942,14 @@ share/doc/qt4/html/widgets-stylesheet-stylesheet-qrc.html
 share/doc/qt4/html/widgets-stylesheet-stylesheeteditor-cpp.html
 share/doc/qt4/html/widgets-stylesheet-stylesheeteditor-h.html
 share/doc/qt4/html/widgets-stylesheet.html
+share/doc/qt4/html/widgets-tablet-main-cpp.html
+share/doc/qt4/html/widgets-tablet-mainwindow-cpp.html
+share/doc/qt4/html/widgets-tablet-mainwindow-h.html
+share/doc/qt4/html/widgets-tablet-tabletapplication-cpp.html
+share/doc/qt4/html/widgets-tablet-tabletapplication-h.html
+share/doc/qt4/html/widgets-tablet-tabletcanvas-cpp.html
+share/doc/qt4/html/widgets-tablet-tabletcanvas-h.html
+share/doc/qt4/html/widgets-tablet.html
 share/doc/qt4/html/widgets-tetrix-main-cpp.html
 share/doc/qt4/html/widgets-tetrix-tetrixboard-cpp.html
 share/doc/qt4/html/widgets-tetrix-tetrixboard-h.html
@@ -3642,4 +3992,14 @@ share/doc/qt4/html/xml-saxbookmarks-xbelgenerator-h.html
 share/doc/qt4/html/xml-saxbookmarks-xbelhandler-cpp.html
 share/doc/qt4/html/xml-saxbookmarks-xbelhandler-h.html
 share/doc/qt4/html/xml-saxbookmarks.html
+share/doc/qt4/html/xml-streambookmarks-main-cpp.html
+share/doc/qt4/html/xml-streambookmarks-mainwindow-cpp.html
+share/doc/qt4/html/xml-streambookmarks-mainwindow-h.html
+share/doc/qt4/html/xml-streambookmarks-xbelreader-cpp.html
+share/doc/qt4/html/xml-streambookmarks-xbelreader-h.html
+share/doc/qt4/html/xml-streambookmarks-xbelwriter-cpp.html
+share/doc/qt4/html/xml-streambookmarks-xbelwriter-h.html
+share/doc/qt4/html/xml-streambookmarks.html
 share/doc/qt4/html/xml-tools.html
+share/doc/qt4/html/xml-xmlstreamlint-main-cpp.html
+share/doc/qt4/html/xml-xmlstreamlint.html

x11/qt4/pkg/PLIST-main

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.6 2007/03/17 17:58:17 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.7 2007/05/22 09:09:32 espie Exp $
 @pkgpath x11/qt4
 %%SHARED%%
 bin/assistant4
@@ -23,6 +23,7 @@ include/X11/qt4/Qt/QtCore
 include/X11/qt4/Qt/QtGui
 include/X11/qt4/Qt/QtNetwork
 include/X11/qt4/Qt/QtOpenGL
+include/X11/qt4/Qt/QtScript
 include/X11/qt4/Qt/QtSql
 include/X11/qt4/Qt/QtSvg
 include/X11/qt4/Qt/QtXml
@@ -148,6 +149,7 @@ include/X11/qt4/Qt/qabstractsocket.h
 include/X11/qt4/Qt/qabstractspinbox.h
 include/X11/qt4/Qt/qabstracttextdocumentlayout.h
 include/X11/qt4/Qt/qaccessible.h
+include/X11/qt4/Qt/qaccessible2.h
 include/X11/qt4/Qt/qaccessiblebridge.h
 include/X11/qt4/Qt/qaccessibleobject.h
 include/X11/qt4/Qt/qaccessibleplugin.h
@@ -170,6 +172,7 @@ include/X11/qt4/Qt/qatomic_powerpc.h
 include/X11/qt4/Qt/qatomic_s390.h
 include/X11/qt4/Qt/qatomic_sparc.h
 include/X11/qt4/Qt/qatomic_x86_64.h
+include/X11/qt4/Qt/qauthenticator.h
 include/X11/qt4/Qt/qbasictimer.h
 include/X11/qt4/Qt/qbitarray.h
 include/X11/qt4/Qt/qbitmap.h
@@ -189,6 +192,7 @@ include/X11/qt4/Qt/qclipboard.h
 include/X11/qt4/Qt/qcolor.h
 include/X11/qt4/Qt/qcolordialog.h
 include/X11/qt4/Qt/qcolormap.h
+include/X11/qt4/Qt/qcolumnview.h
 include/X11/qt4/Qt/qcombobox.h
 include/X11/qt4/Qt/qcommonstyle.h
 include/X11/qt4/Qt/qcompleter.h
@@ -201,6 +205,7 @@ include/X11/qt4/Qt/qconfig.h
 include/X11/qt4/Qt/qcontainerfwd.h
 include/X11/qt4/Qt/qcoreapplication.h
 include/X11/qt4/Qt/qcoreevent.h
+include/X11/qt4/Qt/qcryptographichash.h
 include/X11/qt4/Qt/qcursor.h
 include/X11/qt4/Qt/qdatastream.h
 include/X11/qt4/Qt/qdatawidgetmapper.h
@@ -213,6 +218,7 @@ include/X11/qt4/Qt/qdial.h
 include/X11/qt4/Qt/qdialog.h
 include/X11/qt4/Qt/qdialogbuttonbox.h
 include/X11/qt4/Qt/qdir.h
+include/X11/qt4/Qt/qdiriterator.h
 include/X11/qt4/Qt/qdirmodel.h
 include/X11/qt4/Qt/qdockwidget.h
 include/X11/qt4/Qt/qdom.h
@@ -226,6 +232,7 @@ include/X11/qt4/Qt/qfactoryinterface.h
 include/X11/qt4/Qt/qfeatures.h
 include/X11/qt4/Qt/qfile.h
 include/X11/qt4/Qt/qfiledialog.h
+include/X11/qt4/Qt/qfileiconprovider.h
 include/X11/qt4/Qt/qfileinfo.h
 include/X11/qt4/Qt/qfilesystemwatcher.h
 include/X11/qt4/Qt/qfocusframe.h
@@ -290,6 +297,8 @@ include/X11/qt4/Qt/qlocale.h
 include/X11/qt4/Qt/qmainwindow.h
 include/X11/qt4/Qt/qmap.h
 include/X11/qt4/Qt/qmatrix.h
+include/X11/qt4/Qt/qmdiarea.h
+include/X11/qt4/Qt/qmdisubwindow.h
 include/X11/qt4/Qt/qmenu.h
 include/X11/qt4/Qt/qmenubar.h
 include/X11/qt4/Qt/qmenudata.h
@@ -304,6 +313,7 @@ include/X11/qt4/Qt/qmutex.h
 include/X11/qt4/Qt/qnamespace.h
 include/X11/qt4/Qt/qnetworkinterface.h
 include/X11/qt4/Qt/qnetworkproxy.h
+include/X11/qt4/Qt/qnumeric.h
 include/X11/qt4/Qt/qobject.h
 include/X11/qt4/Qt/qobjectcleanuphandler.h
 include/X11/qt4/Qt/qobjectdefs.h
@@ -342,6 +352,13 @@ include/X11/qt4/Qt/qregion.h
 include/X11/qt4/Qt/qresource.h
 include/X11/qt4/Qt/qrgb.h
 include/X11/qt4/Qt/qrubberband.h
+include/X11/qt4/Qt/qscriptable.h
+include/X11/qt4/Qt/qscriptcontext.h
+include/X11/qt4/Qt/qscriptengine.h
+include/X11/qt4/Qt/qscriptextensioninterface.h
+include/X11/qt4/Qt/qscriptextensionplugin.h
+include/X11/qt4/Qt/qscriptvalue.h
+include/X11/qt4/Qt/qscriptvalueiterator.h
 include/X11/qt4/Qt/qscrollarea.h
 include/X11/qt4/Qt/qscrollbar.h
 include/X11/qt4/Qt/qsemaphore.h
@@ -381,6 +398,12 @@ include/X11/qt4/Qt/qsqlrelationaldelegate.h
 include/X11/qt4/Qt/qsqlrelationaltablemodel.h
 include/X11/qt4/Qt/qsqlresult.h
 include/X11/qt4/Qt/qsqltablemodel.h
+include/X11/qt4/Qt/qssl.h
+include/X11/qt4/Qt/qsslcertificate.h
+include/X11/qt4/Qt/qsslcipher.h
+include/X11/qt4/Qt/qsslerror.h
+include/X11/qt4/Qt/qsslkey.h
+include/X11/qt4/Qt/qsslsocket.h
 include/X11/qt4/Qt/qstack.h
 include/X11/qt4/Qt/qstackedlayout.h
 include/X11/qt4/Qt/qstackedwidget.h
@@ -395,6 +418,7 @@ include/X11/qt4/Qt/qstylefactory.h
 include/X11/qt4/Qt/qstyleoption.h
 include/X11/qt4/Qt/qstylepainter.h
 include/X11/qt4/Qt/qstyleplugin.h
+include/X11/qt4/Qt/qsvggenerator.h
 include/X11/qt4/Qt/qsvgrenderer.h
 include/X11/qt4/Qt/qsvgwidget.h
 include/X11/qt4/Qt/qsyntaxhighlighter.h
@@ -428,6 +452,7 @@ include/X11/qt4/Qt/qtoolbar.h
 include/X11/qt4/Qt/qtoolbox.h
 include/X11/qt4/Qt/qtoolbutton.h
 include/X11/qt4/Qt/qtooltip.h
+include/X11/qt4/Qt/qtransform.h
 include/X11/qt4/Qt/qtranslator.h
 include/X11/qt4/Qt/qtreeview.h
 include/X11/qt4/Qt/qtreewidget.h
@@ -449,12 +474,15 @@ include/X11/qt4/Qt/qwidget.h
 include/X11/qt4/Qt/qwidgetaction.h
 include/X11/qt4/Qt/qwindowdefs.h
 include/X11/qt4/Qt/qwindowsstyle.h
+include/X11/qt4/Qt/qwindowsvistastyle.h
 include/X11/qt4/Qt/qwindowsxpstyle.h
+include/X11/qt4/Qt/qwizard.h
 include/X11/qt4/Qt/qwmatrix.h
 include/X11/qt4/Qt/qworkspace.h
 include/X11/qt4/Qt/qx11embed_x11.h
 include/X11/qt4/Qt/qx11info_x11.h
 include/X11/qt4/Qt/qxml.h
+include/X11/qt4/Qt/qxmlstream.h
 include/X11/qt4/Qt3Support/
 include/X11/qt4/Qt3Support/Q3Accel
 include/X11/qt4/Qt3Support/Q3Action
@@ -759,6 +787,7 @@ include/X11/qt4/QtCore/
 include/X11/qt4/QtCore/QAbstractEventDispatcher
 include/X11/qt4/QtCore/QAbstractFileEngine
 include/X11/qt4/QtCore/QAbstractFileEngineHandler
+include/X11/qt4/QtCore/QAbstractFileEngineIterator
 include/X11/qt4/QtCore/QAbstractItemModel
 include/X11/qt4/QtCore/QAbstractListModel
 include/X11/qt4/QtCore/QAbstractTableModel
@@ -782,15 +811,18 @@ include/X11/qt4/QtCore/QCharRef
 include/X11/qt4/QtCore/QChildEvent
 include/X11/qt4/QtCore/QConstString
 include/X11/qt4/QtCore/QCoreApplication
+include/X11/qt4/QtCore/QCryptographicHash
 include/X11/qt4/QtCore/QCustomEvent
 include/X11/qt4/QtCore/QDataStream
 include/X11/qt4/QtCore/QDate
 include/X11/qt4/QtCore/QDateTime
 include/X11/qt4/QtCore/QDebug
 include/X11/qt4/QtCore/QDir
+include/X11/qt4/QtCore/QDirIterator
 include/X11/qt4/QtCore/QDynamicPropertyChangeEvent
 include/X11/qt4/QtCore/QEvent
 include/X11/qt4/QtCore/QEventLoop
+include/X11/qt4/QtCore/QExplicitlySharedDataPointer
 include/X11/qt4/QtCore/QFSFileEngine
 include/X11/qt4/QtCore/QFactoryInterface
 include/X11/qt4/QtCore/QFile
@@ -805,6 +837,7 @@ include/X11/qt4/QtCore/QForeachContainerBase
 include/X11/qt4/QtCore/QGenericArgument
 include/X11/qt4/QtCore/QGenericReturnArgument
 include/X11/qt4/QtCore/QGlobalStatic
+include/X11/qt4/QtCore/QGlobalStaticDeleter
 include/X11/qt4/QtCore/QHash
 include/X11/qt4/QtCore/QHashData
 include/X11/qt4/QtCore/QHashDummyNode
@@ -892,6 +925,7 @@ include/X11/qt4/QtCore/QString
 include/X11/qt4/QtCore/QStringList
 include/X11/qt4/QtCore/QStringListIterator
 include/X11/qt4/QtCore/QStringMatcher
+include/X11/qt4/QtCore/QStringRef
 include/X11/qt4/QtCore/QSysInfo
 include/X11/qt4/QtCore/QSystemLocale
 include/X11/qt4/QtCore/QTS
@@ -988,10 +1022,12 @@ include/X11/qt4/QtCore/qconfig.h
 include/X11/qt4/QtCore/qcontainerfwd.h
 include/X11/qt4/QtCore/qcoreapplication.h
 include/X11/qt4/QtCore/qcoreevent.h
+include/X11/qt4/QtCore/qcryptographichash.h
 include/X11/qt4/QtCore/qdatastream.h
 include/X11/qt4/QtCore/qdatetime.h
 include/X11/qt4/QtCore/qdebug.h
 include/X11/qt4/QtCore/qdir.h
+include/X11/qt4/QtCore/qdiriterator.h
 include/X11/qt4/QtCore/qendian.h
 include/X11/qt4/QtCore/qeventloop.h
 include/X11/qt4/QtCore/qfactoryinterface.h
@@ -1016,6 +1052,7 @@ include/X11/qt4/QtCore/qmetatype.h
 include/X11/qt4/QtCore/qmimedata.h
 include/X11/qt4/QtCore/qmutex.h
 include/X11/qt4/QtCore/qnamespace.h
+include/X11/qt4/QtCore/qnumeric.h
 include/X11/qt4/QtCore/qobject.h
 include/X11/qt4/QtCore/qobjectcleanuphandler.h
 include/X11/qt4/QtCore/qobjectdefs.h
@@ -1062,6 +1099,7 @@ include/X11/qt4/QtDBus/QDBusAbstractInterface
 include/X11/qt4/QtDBus/QDBusArgument
 include/X11/qt4/QtDBus/QDBusConnection
 include/X11/qt4/QtDBus/QDBusConnectionInterface
+include/X11/qt4/QtDBus/QDBusContext
 include/X11/qt4/QtDBus/QDBusError
 include/X11/qt4/QtDBus/QDBusInterface
 include/X11/qt4/QtDBus/QDBusMessage
@@ -1077,6 +1115,7 @@ include/X11/qt4/QtDBus/qdbusabstractinterface.h
 include/X11/qt4/QtDBus/qdbusargument.h
 include/X11/qt4/QtDBus/qdbusconnection.h
 include/X11/qt4/QtDBus/qdbusconnectioninterface.h
+include/X11/qt4/QtDBus/qdbuscontext.h
 include/X11/qt4/QtDBus/qdbuserror.h
 include/X11/qt4/QtDBus/qdbusextratypes.h
 include/X11/qt4/QtDBus/qdbusinterface.h
@@ -1096,6 +1135,7 @@ include/X11/qt4/QtDesigner/QDesignerContainerExtension
 include/X11/qt4/QtDesigner/QDesignerCustomWidgetCollectionInterface
 include/X11/qt4/QtDesigner/QDesignerCustomWidgetInterface
 include/X11/qt4/QtDesigner/QDesignerDnDItemInterface
+include/X11/qt4/QtDesigner/QDesignerDynamicPropertySheetExtension
 include/X11/qt4/QtDesigner/QDesignerExportWidget
 include/X11/qt4/QtDesigner/QDesignerExtraInfoExtension
 include/X11/qt4/QtDesigner/QDesignerFormEditorInterface
@@ -1105,14 +1145,18 @@ include/X11/qt4/QtDesigner/QDesignerFormWindowInterface
 include/X11/qt4/QtDesigner/QDesignerFormWindowManagerInterface
 include/X11/qt4/QtDesigner/QDesignerFormWindowToolInterface
 include/X11/qt4/QtDesigner/QDesignerIconCacheInterface
+include/X11/qt4/QtDesigner/QDesignerIntegrationInterface
 include/X11/qt4/QtDesigner/QDesignerLanguageExtension
 include/X11/qt4/QtDesigner/QDesignerLayoutDecorationExtension
 include/X11/qt4/QtDesigner/QDesignerMemberSheetExtension
 include/X11/qt4/QtDesigner/QDesignerMetaDataBaseInterface
 include/X11/qt4/QtDesigner/QDesignerMetaDataBaseItemInterface
 include/X11/qt4/QtDesigner/QDesignerObjectInspectorInterface
+include/X11/qt4/QtDesigner/QDesignerPromotionInterface
 include/X11/qt4/QtDesigner/QDesignerPropertyEditorInterface
 include/X11/qt4/QtDesigner/QDesignerPropertySheetExtension
+include/X11/qt4/QtDesigner/QDesignerResourceBrowserInterface
+include/X11/qt4/QtDesigner/QDesignerScriptExtension
 include/X11/qt4/QtDesigner/QDesignerTaskMenuExtension
 include/X11/qt4/QtDesigner/QDesignerWidgetBoxInterface
 include/X11/qt4/QtDesigner/QDesignerWidgetDataBaseInterface
@@ -1133,16 +1177,20 @@ include/X11/qt4/QtDesigner/abstractformwindowcursor.h
 include/X11/qt4/QtDesigner/abstractformwindowmanager.h
 include/X11/qt4/QtDesigner/abstractformwindowtool.h
 include/X11/qt4/QtDesigner/abstracticoncache.h
+include/X11/qt4/QtDesigner/abstractintegration.h
 include/X11/qt4/QtDesigner/abstractlanguage.h
 include/X11/qt4/QtDesigner/abstractmetadatabase.h
 include/X11/qt4/QtDesigner/abstractobjectinspector.h
+include/X11/qt4/QtDesigner/abstractpromotioninterface.h
 include/X11/qt4/QtDesigner/abstractpropertyeditor.h
+include/X11/qt4/QtDesigner/abstractresourcebrowser.h
 include/X11/qt4/QtDesigner/abstractwidgetbox.h
 include/X11/qt4/QtDesigner/abstractwidgetdatabase.h
 include/X11/qt4/QtDesigner/abstractwidgetfactory.h
 include/X11/qt4/QtDesigner/container.h
 include/X11/qt4/QtDesigner/customwidget.h
 include/X11/qt4/QtDesigner/default_extensionfactory.h
+include/X11/qt4/QtDesigner/dynamicpropertysheet.h
 include/X11/qt4/QtDesigner/extension.h
 include/X11/qt4/QtDesigner/extension_global.h
 include/X11/qt4/QtDesigner/extrainfo.h
@@ -1154,6 +1202,7 @@ include/X11/qt4/QtDesigner/qdesigner_components.h
 include/X11/qt4/QtDesigner/qdesigner_components_global.h
 include/X11/qt4/QtDesigner/qdesignerexportwidget.h
 include/X11/qt4/QtDesigner/qextensionmanager.h
+include/X11/qt4/QtDesigner/script.h
 include/X11/qt4/QtDesigner/sdk_global.h
 include/X11/qt4/QtDesigner/taskmenu.h
 include/X11/qt4/QtDesigner/uilib_global.h
@@ -1171,10 +1220,12 @@ include/X11/qt4/QtGui/QAbstractSpinBox
 include/X11/qt4/QtGui/QAbstractTextDocumentLayout
 include/X11/qt4/QtGui/QAbstractUndoItem
 include/X11/qt4/QtGui/QAccessible
+include/X11/qt4/QtGui/QAccessible2Interface
 include/X11/qt4/QtGui/QAccessibleApplication
 include/X11/qt4/QtGui/QAccessibleBridge
 include/X11/qt4/QtGui/QAccessibleBridgeFactoryInterface
 include/X11/qt4/QtGui/QAccessibleBridgePlugin
+include/X11/qt4/QtGui/QAccessibleEditableTextInterface
 include/X11/qt4/QtGui/QAccessibleEvent
 include/X11/qt4/QtGui/QAccessibleFactoryInterface
 include/X11/qt4/QtGui/QAccessibleInterface
@@ -1182,6 +1233,10 @@ include/X11/qt4/QtGui/QAccessibleInterfaceEx
 include/X11/qt4/QtGui/QAccessibleObject
 include/X11/qt4/QtGui/QAccessibleObjectEx
 include/X11/qt4/QtGui/QAccessiblePlugin
+include/X11/qt4/QtGui/QAccessibleSimpleEditableTextInterface
+include/X11/qt4/QtGui/QAccessibleTableInterface
+include/X11/qt4/QtGui/QAccessibleTextInterface
+include/X11/qt4/QtGui/QAccessibleValueInterface
 include/X11/qt4/QtGui/QAccessibleWidget
 include/X11/qt4/QtGui/QAccessibleWidgetEx
 include/X11/qt4/QtGui/QAction
@@ -1204,6 +1259,7 @@ include/X11/qt4/QtGui/QColor
 include/X11/qt4/QtGui/QColorDialog
 include/X11/qt4/QtGui/QColorGroup
 include/X11/qt4/QtGui/QColormap
+include/X11/qt4/QtGui/QColumnView
 include/X11/qt4/QtGui/QComboBox
 include/X11/qt4/QtGui/QCommonStyle
 include/X11/qt4/QtGui/QCompleter
@@ -1277,7 +1333,10 @@ include/X11/qt4/QtGui/QIcon
 include/X11/qt4/QtGui/QIconDragEvent
 include/X11/qt4/QtGui/QIconEngine
 include/X11/qt4/QtGui/QIconEngineFactoryInterface
+include/X11/qt4/QtGui/QIconEngineFactoryInterfaceV2
 include/X11/qt4/QtGui/QIconEnginePlugin
+include/X11/qt4/QtGui/QIconEnginePluginV2
+include/X11/qt4/QtGui/QIconEngineV2
 include/X11/qt4/QtGui/QIconSet
 include/X11/qt4/QtGui/QImage
 include/X11/qt4/QtGui/QImageIOHandler
@@ -1317,6 +1376,8 @@ include/X11/qt4/QtGui/QMacMime
 include/X11/qt4/QtGui/QMacPasteboardMime
 include/X11/qt4/QtGui/QMainWindow
 include/X11/qt4/QtGui/QMatrix
+include/X11/qt4/QtGui/QMdiArea
+include/X11/qt4/QtGui/QMdiSubWindow
 include/X11/qt4/QtGui/QMenu
 include/X11/qt4/QtGui/QMenuBar
 include/X11/qt4/QtGui/QMenuItem
@@ -1390,11 +1451,13 @@ include/X11/qt4/QtGui/QStyleFactory
 include/X11/qt4/QtGui/QStyleFactoryInterface
 include/X11/qt4/QtGui/QStyleHintReturn
 include/X11/qt4/QtGui/QStyleHintReturnMask
+include/X11/qt4/QtGui/QStyleHintReturnVariant
 include/X11/qt4/QtGui/QStyleOption
 include/X11/qt4/QtGui/QStyleOptionButton
 include/X11/qt4/QtGui/QStyleOptionComboBox
 include/X11/qt4/QtGui/QStyleOptionComplex
 include/X11/qt4/QtGui/QStyleOptionDockWidget
+include/X11/qt4/QtGui/QStyleOptionDockWidgetV2
 include/X11/qt4/QtGui/QStyleOptionFocusRect
 include/X11/qt4/QtGui/QStyleOptionFrame
 include/X11/qt4/QtGui/QStyleOptionFrameV2
@@ -1418,9 +1481,11 @@ include/X11/qt4/QtGui/QStyleOptionTabWidgetFrame
 include/X11/qt4/QtGui/QStyleOptionTitleBar
 include/X11/qt4/QtGui/QStyleOptionToolBar
 include/X11/qt4/QtGui/QStyleOptionToolBox
+include/X11/qt4/QtGui/QStyleOptionToolBoxV2
 include/X11/qt4/QtGui/QStyleOptionToolButton
 include/X11/qt4/QtGui/QStyleOptionViewItem
 include/X11/qt4/QtGui/QStyleOptionViewItemV2
+include/X11/qt4/QtGui/QStyleOptionViewItemV3
 include/X11/qt4/QtGui/QStylePainter
 include/X11/qt4/QtGui/QStylePlugin
 include/X11/qt4/QtGui/QSyntaxHighlighter
@@ -1467,6 +1532,7 @@ include/X11/qt4/QtGui/QToolBarChangeEvent
 include/X11/qt4/QtGui/QToolBox
 include/X11/qt4/QtGui/QToolButton
 include/X11/qt4/QtGui/QToolTip
+include/X11/qt4/QtGui/QTransform
 include/X11/qt4/QtGui/QTreeView
 include/X11/qt4/QtGui/QTreeWidget
 include/X11/qt4/QtGui/QTreeWidgetItem
@@ -1492,7 +1558,10 @@ include/X11/qt4/QtGui/QWidgetSet
 include/X11/qt4/QtGui/QWindowStateChangeEvent
 include/X11/qt4/QtGui/QWindowsMime
 include/X11/qt4/QtGui/QWindowsStyle
+include/X11/qt4/QtGui/QWindowsVistaStyle
 include/X11/qt4/QtGui/QWindowsXPStyle
+include/X11/qt4/QtGui/QWizard
+include/X11/qt4/QtGui/QWizardPage
 include/X11/qt4/QtGui/QWorkspace
 include/X11/qt4/QtGui/QX11EmbedContainer
 include/X11/qt4/QtGui/QX11EmbedWidget
@@ -1510,6 +1579,7 @@ include/X11/qt4/QtGui/qabstractslider.h
 include/X11/qt4/QtGui/qabstractspinbox.h
 include/X11/qt4/QtGui/qabstracttextdocumentlayout.h
 include/X11/qt4/QtGui/qaccessible.h
+include/X11/qt4/QtGui/qaccessible2.h
 include/X11/qt4/QtGui/qaccessiblebridge.h
 include/X11/qt4/QtGui/qaccessibleobject.h
 include/X11/qt4/QtGui/qaccessibleplugin.h
@@ -1529,6 +1599,7 @@ include/X11/qt4/QtGui/qclipboard.h
 include/X11/qt4/QtGui/qcolor.h
 include/X11/qt4/QtGui/qcolordialog.h
 include/X11/qt4/QtGui/qcolormap.h
+include/X11/qt4/QtGui/qcolumnview.h
 include/X11/qt4/QtGui/qcombobox.h
 include/X11/qt4/QtGui/qcommonstyle.h
 include/X11/qt4/QtGui/qcompleter.h
@@ -1547,6 +1618,7 @@ include/X11/qt4/QtGui/qdrawutil.h
 include/X11/qt4/QtGui/qerrormessage.h
 include/X11/qt4/QtGui/qevent.h
 include/X11/qt4/QtGui/qfiledialog.h
+include/X11/qt4/QtGui/qfileiconprovider.h
 include/X11/qt4/QtGui/qfocusframe.h
 include/X11/qt4/QtGui/qfont.h
 include/X11/qt4/QtGui/qfontcombobox.h
@@ -1587,6 +1659,8 @@ include/X11/qt4/QtGui/qlistview.h
 include/X11/qt4/QtGui/qlistwidget.h
 include/X11/qt4/QtGui/qmainwindow.h
 include/X11/qt4/QtGui/qmatrix.h
+include/X11/qt4/QtGui/qmdiarea.h
+include/X11/qt4/QtGui/qmdisubwindow.h
 include/X11/qt4/QtGui/qmenu.h
 include/X11/qt4/QtGui/qmenubar.h
 include/X11/qt4/QtGui/qmenudata.h
@@ -1661,6 +1735,7 @@ include/X11/qt4/QtGui/qtoolbar.h
 include/X11/qt4/QtGui/qtoolbox.h
 include/X11/qt4/QtGui/qtoolbutton.h
 include/X11/qt4/QtGui/qtooltip.h
+include/X11/qt4/QtGui/qtransform.h
 include/X11/qt4/QtGui/qtreeview.h
 include/X11/qt4/QtGui/qtreewidget.h
 include/X11/qt4/QtGui/qtreewidgetitemiterator.h
@@ -1673,13 +1748,16 @@ include/X11/qt4/QtGui/qwidget.h
 include/X11/qt4/QtGui/qwidgetaction.h
 include/X11/qt4/QtGui/qwindowdefs.h
 include/X11/qt4/QtGui/qwindowsstyle.h
+include/X11/qt4/QtGui/qwindowsvistastyle.h
 include/X11/qt4/QtGui/qwindowsxpstyle.h
+include/X11/qt4/QtGui/qwizard.h
 include/X11/qt4/QtGui/qwmatrix.h
 include/X11/qt4/QtGui/qworkspace.h
 include/X11/qt4/QtGui/qx11embed_x11.h
 include/X11/qt4/QtGui/qx11info_x11.h
 include/X11/qt4/QtNetwork/
 include/X11/qt4/QtNetwork/QAbstractSocket
+include/X11/qt4/QtNetwork/QAuthenticator
 include/X11/qt4/QtNetwork/QFtp
 include/X11/qt4/QtNetwork/QHostAddress
 include/X11/qt4/QtNetwork/QHostInfo
@@ -1691,6 +1769,11 @@ include/X11/qt4/QtNetwork/QIPv6Address
 include/X11/qt4/QtNetwork/QNetworkAddressEntry
 include/X11/qt4/QtNetwork/QNetworkInterface
 include/X11/qt4/QtNetwork/QNetworkProxy
+include/X11/qt4/QtNetwork/QSslCertificate
+include/X11/qt4/QtNetwork/QSslCipher
+include/X11/qt4/QtNetwork/QSslError
+include/X11/qt4/QtNetwork/QSslKey
+include/X11/qt4/QtNetwork/QSslSocket
 include/X11/qt4/QtNetwork/QTcpServer
 include/X11/qt4/QtNetwork/QTcpSocket
 include/X11/qt4/QtNetwork/QUdpSocket
@@ -1698,12 +1781,19 @@ include/X11/qt4/QtNetwork/QUrlInfo
 include/X11/qt4/QtNetwork/Q_IPV6ADDR
 include/X11/qt4/QtNetwork/QtNetwork
 include/X11/qt4/QtNetwork/qabstractsocket.h
+include/X11/qt4/QtNetwork/qauthenticator.h
 include/X11/qt4/QtNetwork/qftp.h
 include/X11/qt4/QtNetwork/qhostaddress.h
 include/X11/qt4/QtNetwork/qhostinfo.h
 include/X11/qt4/QtNetwork/qhttp.h
 include/X11/qt4/QtNetwork/qnetworkinterface.h
 include/X11/qt4/QtNetwork/qnetworkproxy.h
+include/X11/qt4/QtNetwork/qssl.h
+include/X11/qt4/QtNetwork/qsslcertificate.h
+include/X11/qt4/QtNetwork/qsslcipher.h
+include/X11/qt4/QtNetwork/qsslerror.h
+include/X11/qt4/QtNetwork/qsslkey.h
+include/X11/qt4/QtNetwork/qsslsocket.h
 include/X11/qt4/QtNetwork/qtcpserver.h
 include/X11/qt4/QtNetwork/qtcpsocket.h
 include/X11/qt4/QtNetwork/qudpsocket.h
@@ -1720,6 +1810,23 @@ include/X11/qt4/QtOpenGL/qgl.h
 include/X11/qt4/QtOpenGL/qglcolormap.h
 include/X11/qt4/QtOpenGL/qglframebufferobject.h
 include/X11/qt4/QtOpenGL/qglpixelbuffer.h
+include/X11/qt4/QtScript/
+include/X11/qt4/QtScript/QScriptContext
+include/X11/qt4/QtScript/QScriptEngine
+include/X11/qt4/QtScript/QScriptExtensionInterface
+include/X11/qt4/QtScript/QScriptExtensionPlugin
+include/X11/qt4/QtScript/QScriptValue
+include/X11/qt4/QtScript/QScriptValueIterator
+include/X11/qt4/QtScript/QScriptValueList
+include/X11/qt4/QtScript/QScriptable
+include/X11/qt4/QtScript/QtScript
+include/X11/qt4/QtScript/qscriptable.h
+include/X11/qt4/QtScript/qscriptcontext.h
+include/X11/qt4/QtScript/qscriptengine.h
+include/X11/qt4/QtScript/qscriptextensioninterface.h
+include/X11/qt4/QtScript/qscriptextensionplugin.h
+include/X11/qt4/QtScript/qscriptvalue.h
+include/X11/qt4/QtScript/qscriptvalueiterator.h
 include/X11/qt4/QtSql/
 include/X11/qt4/QtSql/QIBaseDriver
 include/X11/qt4/QtSql/QIBaseResult
@@ -1773,10 +1880,12 @@ include/X11/qt4/QtSql/qsqlresult.h
 include/X11/qt4/QtSql/qsqltablemodel.h
 include/X11/qt4/QtSvg/
 include/X11/qt4/QtSvg/QGraphicsSvgItem
+include/X11/qt4/QtSvg/QSvgGenerator
 include/X11/qt4/QtSvg/QSvgRenderer
 include/X11/qt4/QtSvg/QSvgWidget
 include/X11/qt4/QtSvg/QtSvg
 include/X11/qt4/QtSvg/qgraphicssvgitem.h
+include/X11/qt4/QtSvg/qsvggenerator.h
 include/X11/qt4/QtSvg/qsvgrenderer.h
 include/X11/qt4/QtSvg/qsvgwidget.h
 include/X11/qt4/QtTest/
@@ -1845,20 +1954,22 @@ include/X11/qt4/QtXml/QXmlNamespaceSupport
 include/X11/qt4/QtXml/QXmlParseException
 include/X11/qt4/QtXml/QXmlReader
 include/X11/qt4/QtXml/QXmlSimpleReader
+include/X11/qt4/QtXml/QXmlStreamAttribute
+include/X11/qt4/QtXml/QXmlStreamAttributes
+include/X11/qt4/QtXml/QXmlStreamEntityDeclaration
+include/X11/qt4/QtXml/QXmlStreamEntityDeclarations
+include/X11/qt4/QtXml/QXmlStreamNamespaceDeclaration
+include/X11/qt4/QtXml/QXmlStreamNamespaceDeclarations
+include/X11/qt4/QtXml/QXmlStreamNotationDeclaration
+include/X11/qt4/QtXml/QXmlStreamNotationDeclarations
+include/X11/qt4/QtXml/QXmlStreamReader
+include/X11/qt4/QtXml/QXmlStreamStringRef
+include/X11/qt4/QtXml/QXmlStreamWriter
 include/X11/qt4/QtXml/QtXml
 include/X11/qt4/QtXml/qdom.h
 include/X11/qt4/QtXml/qxml.h
+include/X11/qt4/QtXml/qxmlstream.h
 lib/qt4/
-lib/qt4/Qt3Support.pc
-lib/qt4/QtCore.pc
-lib/qt4/QtDBus.pc
-lib/qt4/QtGui.pc
-lib/qt4/QtNetwork.pc
-lib/qt4/QtOpenGL.pc
-lib/qt4/QtSql.pc
-lib/qt4/QtSvg.pc
-lib/qt4/QtTest.pc
-lib/qt4/QtXml.pc
 lib/qt4/bin/
 lib/qt4/bin/assistant
 lib/qt4/bin/assistant4
@@ -1871,6 +1982,7 @@ lib/qt4/bin/moc
 lib/qt4/bin/pixeltool
 lib/qt4/bin/qdbus
 lib/qt4/bin/qdbuscpp2xml
+lib/qt4/bin/qdbusviewer
 lib/qt4/bin/qdbusxml2cpp
 lib/qt4/bin/qmake
 lib/qt4/bin/qt3to4
@@ -1895,6 +2007,8 @@ lib/qt4/libQtGui.prl
 lib/qt4/libQtNetwork.prl
 @comment lib/qt4/libQtOpenGL.la
 lib/qt4/libQtOpenGL.prl
+lib/qt4/libQtScript.la
+lib/qt4/libQtScript.prl
 @comment lib/qt4/libQtSql.la
 lib/qt4/libQtSql.prl
 lib/qt4/libQtSvg.la
@@ -1921,6 +2035,8 @@ lib/qt4/mkspecs/aix-xlc/qplatformdefs.h
 lib/qt4/mkspecs/common/
 lib/qt4/mkspecs/common/g++.conf
 lib/qt4/mkspecs/common/linux.conf
+lib/qt4/mkspecs/common/mac-g++.conf
+lib/qt4/mkspecs/common/mac.conf
 lib/qt4/mkspecs/common/unix.conf
 lib/qt4/mkspecs/darwin-g++/
 lib/qt4/mkspecs/darwin-g++/qmake.conf
@@ -1936,15 +2052,20 @@ lib/qt4/mkspecs/features/default_pre.prf
 lib/qt4/mkspecs/features/designer.prf
 lib/qt4/mkspecs/features/dll.prf
 lib/qt4/mkspecs/features/exclusive_builds.prf
+lib/qt4/mkspecs/features/incredibuild_xge.prf
+lib/qt4/mkspecs/features/lex.prf
 lib/qt4/mkspecs/features/link_pkgconfig.prf
 lib/qt4/mkspecs/features/mac/
 lib/qt4/mkspecs/features/mac/default_post.prf
 lib/qt4/mkspecs/features/mac/default_pre.prf
+lib/qt4/mkspecs/features/mac/dwarf2.prf
 lib/qt4/mkspecs/features/mac/objective_c.prf
 lib/qt4/mkspecs/features/mac/ppc.prf
+lib/qt4/mkspecs/features/mac/ppc64.prf
 lib/qt4/mkspecs/features/mac/rez.prf
 lib/qt4/mkspecs/features/mac/sdk.prf
 lib/qt4/mkspecs/features/mac/x86.prf
+lib/qt4/mkspecs/features/mac/x86_64.prf
 lib/qt4/mkspecs/features/moc.prf
 lib/qt4/mkspecs/features/qdbus.prf
 lib/qt4/mkspecs/features/qt.prf
@@ -1964,6 +2085,7 @@ lib/qt4/mkspecs/features/staticlib.prf
 lib/qt4/mkspecs/features/uic.prf
 lib/qt4/mkspecs/features/uitools.prf
 lib/qt4/mkspecs/features/unix/
+lib/qt4/mkspecs/features/unix/bsymbolic_functions.prf
 lib/qt4/mkspecs/features/unix/dylib.prf
 lib/qt4/mkspecs/features/unix/hide_symbols.prf
 lib/qt4/mkspecs/features/unix/largefile.prf
@@ -1995,6 +2117,7 @@ lib/qt4/mkspecs/features/win32/stl_off.prf
 lib/qt4/mkspecs/features/win32/thread.prf
 lib/qt4/mkspecs/features/win32/thread_off.prf
 lib/qt4/mkspecs/features/win32/windows.prf
+lib/qt4/mkspecs/features/yacc.prf
 lib/qt4/mkspecs/freebsd-g++/
 lib/qt4/mkspecs/freebsd-g++/qmake.conf
 lib/qt4/mkspecs/freebsd-g++/qplatformdefs.h
@@ -2059,14 +2182,17 @@ lib/qt4/mkspecs/linux-g++-64/qplatformdefs.h
 lib/qt4/mkspecs/linux-g++/qmake.conf
 lib/qt4/mkspecs/linux-g++/qplatformdefs.h
 lib/qt4/mkspecs/linux-icc/
+lib/qt4/mkspecs/linux-icc-64/
+lib/qt4/mkspecs/linux-icc-64/qmake.conf
+lib/qt4/mkspecs/linux-icc-64/qplatformdefs.h
 lib/qt4/mkspecs/linux-icc/qmake.conf
 lib/qt4/mkspecs/linux-icc/qplatformdefs.h
 lib/qt4/mkspecs/linux-kcc/
 lib/qt4/mkspecs/linux-kcc/qmake.conf
 lib/qt4/mkspecs/linux-kcc/qplatformdefs.h
-lib/qt4/mkspecs/linux-lsb/
-lib/qt4/mkspecs/linux-lsb/qmake.conf
-lib/qt4/mkspecs/linux-lsb/qplatformdefs.h
+lib/qt4/mkspecs/linux-lsb-g++/
+lib/qt4/mkspecs/linux-lsb-g++/qmake.conf
+lib/qt4/mkspecs/linux-lsb-g++/qplatformdefs.h
 lib/qt4/mkspecs/linux-pgcc/
 lib/qt4/mkspecs/linux-pgcc/qmake.conf
 lib/qt4/mkspecs/linux-pgcc/qplatformdefs.h
@@ -2120,6 +2246,9 @@ lib/qt4/mkspecs/qws/linux-generic-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/linux-ipaq-g++/
 lib/qt4/mkspecs/qws/linux-ipaq-g++/qmake.conf
 lib/qt4/mkspecs/qws/linux-ipaq-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/linux-lsb-g++/
+lib/qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
+lib/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/linux-mips-g++/
 lib/qt4/mkspecs/qws/linux-mips-g++/qmake.conf
 lib/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
@@ -2185,6 +2314,20 @@ lib/qt4/phrasebooks/norwegian.qph
 lib/qt4/phrasebooks/russian.qph
 lib/qt4/phrasebooks/spanish.qph
 lib/qt4/phrasebooks/swedish.qph
+lib/qt4/pkgconfig/
+lib/qt4/pkgconfig/Qt3Support.pc
+lib/qt4/pkgconfig/QtAssistantClient.pc
+lib/qt4/pkgconfig/QtCore.pc
+lib/qt4/pkgconfig/QtDBus.pc
+lib/qt4/pkgconfig/QtGui.pc
+lib/qt4/pkgconfig/QtNetwork.pc
+lib/qt4/pkgconfig/QtOpenGL.pc
+lib/qt4/pkgconfig/QtScript.pc
+lib/qt4/pkgconfig/QtSql.pc
+lib/qt4/pkgconfig/QtSvg.pc
+lib/qt4/pkgconfig/QtTest.pc
+lib/qt4/pkgconfig/QtUiTools.pc
+lib/qt4/pkgconfig/QtXml.pc
 lib/qt4/plugins/
 lib/qt4/plugins/accessible/
 lib/qt4/plugins/codecs/
@@ -2195,14 +2338,19 @@ lib/qt4/plugins/inputmethods/
 lib/qt4/plugins/sqldrivers/
 lib/qt4/q3porting.xml
 lib/qt4/translations/
+lib/qt4/translations/assistant_de.qm
+lib/qt4/translations/designer_de.qm
+lib/qt4/translations/designer_ja.qm
 lib/qt4/translations/qt_ar.qm
 lib/qt4/translations/qt_de.qm
 lib/qt4/translations/qt_es.qm
 lib/qt4/translations/qt_fr.qm
 lib/qt4/translations/qt_iw.qm
+lib/qt4/translations/qt_pt.qm
 lib/qt4/translations/qt_ru.qm
 lib/qt4/translations/qt_sk.qm
 lib/qt4/translations/qt_sv.qm
+lib/qt4/translations/qt_uk.qm
 lib/qt4/translations/qt_zh_CN.qm
 share/doc/qt4/OPENSOURCE-NOTICE.TXT
 share/doc/qt4/README