qt 4.7.0

2010-10-28 14:55:47 +00:00 · 2010-10-28 14:55:47 +00:00 · 8e7eacb6ce
commit 8e7eacb6ce
parent 1c010712c9
33 changed files with 2451 additions and 375 deletions
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.80 2010/10/24 21:15:34 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.81 2010/10/28 14:55:47 espie Exp $

 USE_GMAKE =		Yes
 COMMENT-debug =		C++ GUI toolkit, debug
@ -23,39 +23,31 @@ PKGNAME-debug =		qt4-debug-${PKGVERSION}
 FULLPKGNAME-html =	qt4-html-${PKGVERSION}
 FULLPKGPATH-html =	${BASE_PKGPATH},-html

-REVISION-mysql =	3
-REVISION-postgresql =	3
-REVISION-examples =	3
-REVISION-sqlite2 =	3
-REVISION-sqlite =	3	
-REVISION-tds =		3
-REVISION-main = 	3
-
 SHARED_LIBS =	Qt3Support 8.0 \
-		QtCore 8.0 \
+		QtCore 9.0 \
 		QtDesigner 7.0 \
 		QtDesignerComponents 7.0 \
-		QtGui 9.0 \
-		QtNetwork 8.0 \
+		QtGui 10.0 \
+		QtNetwork 9.0 \
 		QtOpenGL 7.0 \
 		QtSql 8.0 \
 		QtXml 8.0 \
 		QtSvg 7.0 \
 		QtTest 7.0 \
-		QtAssistantClient 3.0 \
 		QtDBus 2.0 \
 		QtMultimedia 0.0 \
-		QtScript 1.0 \
+		QtScript 2.0 \
 		QtCLucene 0.0 \
 		QtHelp 1.0 \
 		QtXmlPatterns 0.0 \
 		QtScriptTools 0.0 \
 		QtWebKit 1.0 \
-		phonon 4.1
+		phonon 4.1 \
+		QtDeclarative 0.0 


-VERSION =	4.6.3
-PKGVERSION =	4.6.3
+VERSION =	4.7.0
+PKGVERSION =	4.7.0
 DISTNAME =	qt-everywhere-opensource-src-${VERSION}

 CATEGORIES =	x11
@ -183,11 +175,11 @@ WANTLIB =

 commonWANTLIB =		ICE Xrender c GLU SM freetype pthread Xinerama \
 			Xext GL Xi m X11.>=10 z fontconfig \
-			expat
-commonLIB_DEPENDS =	png.>=2::graphics/png
+			expat png.>=2
+commonLIB_DEPENDS =	::graphics/png

-sqlWANTLIB =		m
-sqlLIB_DEPENDS = 	QtCore.>=4,QtSql::${BASE_PKGPATH}
+sqlWANTLIB =		m lib/qt4/QtCore.>=4 QtSql
+sqlLIB_DEPENDS = 	::${BASE_PKGPATH}


 LIB_DEPENDS-main =	${LIB_DEPENDS} ${commonLIB_DEPENDS} \
@ -233,10 +225,10 @@ WANTLIB-examples =	${WANTLIB} ${commonWANTLIB} lib/qt4/QtDesigner \
 			lib/qt4/QtCore lib/qt4/QtGui lib/qt4/QtNetwork \
 			lib/qt4/QtOpenGL lib/qt4/QtSql lib/qt4/QtXml \
 			lib/qt4/QtSvg lib/qt4/QtTest lib/qt4/Qt3Support \
-			lib/qt4/QtAssistantClient lib/qt4/QtDBus \
+			lib/qt4/QtDBus \
 			lib/qt4/QtScript lib/qt4/QtScriptTools \
 			lib/qt4/QtHelp lib/qt4/QtCLucene lib/qt4/phonon \
-			lib/qt4/QtMultimedia
+			lib/qt4/QtMultimedia lib/qt4/QtDeclarative

 LIB_DEPENDS-html =
 WANTLIB-html =
@ -249,7 +241,7 @@ CONFIGURE_ARGS +=	-platform openbsd-g++4
 PKG_ARGS += -DGCC4=1
 WANTLIB += stdc++
 LIB_DEPENDS-examples +=	::${BASE_PKGPATH}
-WANTLIB-examples +=	sqlite3 QtWebKit QtXmlPatterns
+WANTLIB-examples +=	sqlite3 lib/qt4/QtWebKit lib/qt4/QtXmlPatterns
 LIB_DEPENDS-main += ::databases/sqlite3
 WANTLIB-main += sqlite3
 .else
--- a/x11/qt4/distinfo
+++ b/x11/qt4/distinfo
@ -1,5 +1,5 @@
-MD5 (qt-everywhere-opensource-src-4.6.3.tar.gz) = XGnxbUUrC7PUS8PBBVbAcg==
-RMD160 (qt-everywhere-opensource-src-4.6.3.tar.gz) = zrPKeCY9DZzfkv75A+MMACbba/8=
-SHA1 (qt-everywhere-opensource-src-4.6.3.tar.gz) = HBilZN+SlsfLDg3t3kC5hD4bMOg=
-SHA256 (qt-everywhere-opensource-src-4.6.3.tar.gz) = 9OCtqNTVFru4YAo+59kEbJx544zXgd+f/EbY8WrNF2g=
-SIZE (qt-everywhere-opensource-src-4.6.3.tar.gz) = 160993454
+MD5 (qt-everywhere-opensource-src-4.7.0.tar.gz) = Oi8lubEVA3J39Pt1kZSnpQ==
+RMD160 (qt-everywhere-opensource-src-4.7.0.tar.gz) = PpwPDZhDtcA61L1hk6/5hTHuB0Y=
+SHA1 (qt-everywhere-opensource-src-4.7.0.tar.gz) = pXlsj0aMj1kknlxpb5E4ZMl59BE=
+SHA256 (qt-everywhere-opensource-src-4.7.0.tar.gz) = 4FJW1WDKfWdM1DELt5F0iQCtFK1mLL/iK21yraQ+eVU=
+SIZE (qt-everywhere-opensource-src-4.7.0.tar.gz) = 208320257
--- a/x11/qt4/patches/patch-config_tests_unix_odbc_odbc_pro
+++ b/x11/qt4/patches/patch-config_tests_unix_odbc_odbc_pro
@ -1,9 +1,10 @@
-$OpenBSD: patch-config_tests_unix_odbc_odbc_pro,v 1.2 2008/10/21 22:20:00 espie Exp $
--- config.tests/unix/odbc/odbc.pro.orig	Wed Apr  2 18:29:20 2008
-+++ config.tests/unix/odbc/odbc.pro	Thu Apr  3 21:43:37 2008
-@@ -1,4 +1,4 @@
+$OpenBSD: patch-config_tests_unix_odbc_odbc_pro,v 1.3 2010/10/28 14:55:47 espie Exp $
+--- config.tests/unix/odbc/odbc.pro.orig	Fri Sep 10 11:04:41 2010
+++ config.tests/unix/odbc/odbc.pro	Sun Oct 24 12:32:06 2010
+@@ -1,5 +1,5 @@
 SOURCES = odbc.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
-LIBS += -lodbc
+-win32-g++*:LIBS += -lodbc32
 +LIBS += -liodbc
+ else:LIBS += -lodbc
--- a/x11/qt4/patches/patch-configure
+++ b/x11/qt4/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.19 2010/06/21 16:40:52 espie Exp $
--- configure.orig	Wed Jun  2 04:03:10 2010
-+++ configure	Mon Jun 21 11:32:32 2010
-@@ -2015,7 +2015,7 @@ while [ "$#" -gt 0 ]; do
+$OpenBSD: patch-configure,v 1.20 2010/10/28 14:55:47 espie Exp $
+--- configure.orig	Fri Sep 10 11:04:46 2010
+++ configure	Sun Oct 24 12:32:06 2010
+@@ -2085,7 +2085,7 @@ while [ "$#" -gt 0 ]; do
     v|verbose)
         if [ "$VAL" = "yes" ]; then
             if [ "$OPT_VERBOSE" = "$VAL" ]; then            # takes two verboses to turn on qmake debugs
@ -10,7 +10,16 @@ $OpenBSD: patch-configure,v 1.19 2010/06/21 16:40:52 espie Exp $
             else
                 OPT_VERBOSE=yes
             fi
-@@ -4445,7 +4445,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4516,7 +4516,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+         EXTRA_OBJS=
+         EXTRA_SRCS=
+         EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
+-        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS)"
+        EXTRA_CXXFLAGS="\$(QMAKE_CXXFLAGS) -DLOCALBASE=\\\\\"${LOCALBASE}\\\\\" -DX11BASE=\\\\\"${X11BASE}\\\\\""
+         EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
+ 
+         if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
+@@ -4620,7 +4620,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
     done
 
     QMAKE_BUILD_ERROR=no
--- a/x11/qt4/patches/patch-examples_threads_waitconditions_waitconditions_pro
+++ b/x11/qt4/patches/patch-examples_threads_waitconditions_waitconditions_pro
@ -1,12 +0,0 @@
-$OpenBSD: patch-examples_threads_waitconditions_waitconditions_pro,v 1.1 2010/05/23 10:36:49 espie Exp $
--- examples/threads/waitconditions/waitconditions.pro.orig	Mon May 17 15:52:44 2010
-+++ examples/threads/waitconditions/waitconditions.pro	Mon May 17 15:52:52 2010
-@@ -10,7 +10,7 @@ INCLUDEPATH += .
- # Input
- SOURCES += waitconditions.cpp
- CONFIG += qt warn_on create_prl link_prl console
-OBJECTS_DIR=obj/debug-shared
-+OBJECTS_DIR=.obj/debug-shared
- MOC_DIR=moc/debug-shared
- 
- # install
--- a/x11/qt4/patches/patch-mkspecs_openbsd-g++4_qmake_conf
+++ b/x11/qt4/patches/patch-mkspecs_openbsd-g++4_qmake_conf
@ -1,7 +1,7 @@
-$OpenBSD: patch-mkspecs_openbsd-g++4_qmake_conf,v 1.1 2010/05/23 10:36:49 espie Exp $
--- mkspecs/openbsd-g++4/qmake.conf.orig	Mon May 17 22:05:26 2010
-+++ mkspecs/openbsd-g++4/qmake.conf	Mon May 17 22:11:01 2010
-@@ -7,16 +7,17 @@ TEMPLATE		= app
+$OpenBSD: patch-mkspecs_openbsd-g++4_qmake_conf,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- mkspecs/openbsd-g++4/qmake.conf.orig	Sun Oct 24 12:32:06 2010
+++ mkspecs/openbsd-g++4/qmake.conf	Sun Oct 24 12:32:06 2010
+@@ -8,16 +8,17 @@ TEMPLATE		= app
 CONFIG			+= qt warn_on release link_prl
 QT			+= core gui
 
@ -21,7 +21,7 @@ $OpenBSD: patch-mkspecs_openbsd-g++4_qmake_conf,v 1.1 2010/05/23 10:36:49 espie
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-@@ -35,10 +36,10 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
+@@ -36,10 +37,10 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
@ -36,7 +36,7 @@ $OpenBSD: patch-mkspecs_openbsd-g++4_qmake_conf,v 1.1 2010/05/23 10:36:49 espie
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-@@ -56,7 +57,7 @@ QMAKE_LFLAGS_RELEASE	=
+@@ -57,7 +58,7 @@ QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
--- a/x11/qt4/patches/patch-mkspecs_openbsd-g++4_qplatformdefs_h
+++ b/x11/qt4/patches/patch-mkspecs_openbsd-g++4_qplatformdefs_h
@ -1,10 +1,9 @@
-$OpenBSD: patch-mkspecs_openbsd-g++4_qplatformdefs_h,v 1.1 2010/05/23 10:36:49 espie Exp $
--- mkspecs/openbsd-g++4/qplatformdefs.h.orig	Mon May 17 22:19:37 2010
-+++ mkspecs/openbsd-g++4/qplatformdefs.h	Mon May 17 22:13:40 2010
-@@ -148,5 +148,6 @@
+$OpenBSD: patch-mkspecs_openbsd-g++4_qplatformdefs_h,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- mkspecs/openbsd-g++4/qplatformdefs.h.orig	Sun Oct 24 12:32:06 2010
+++ mkspecs/openbsd-g++4/qplatformdefs.h	Sun Oct 24 12:32:06 2010
+@@ -108,4 +108,5 @@
 #define QT_AOUT_UNDERSCORE
 #endif
 
 +#define QT_GCC4_ATOMICS
- 
 #endif // QPLATFORMDEFS_H
--- a/x11/qt4/patches/patch-mkspecs_openbsd-g++_qmake_conf
+++ b/x11/qt4/patches/patch-mkspecs_openbsd-g++_qmake_conf
@ -1,7 +1,7 @@
-$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.8 2010/05/23 10:36:49 espie Exp $
--- mkspecs/openbsd-g++/qmake.conf.orig	Thu Feb 11 16:55:14 2010
-+++ mkspecs/openbsd-g++/qmake.conf	Mon May 17 22:11:13 2010
-@@ -7,16 +7,17 @@ TEMPLATE		= app
+$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.9 2010/10/28 14:55:47 espie Exp $
+--- mkspecs/openbsd-g++/qmake.conf.orig	Fri Sep 10 11:04:49 2010
+++ mkspecs/openbsd-g++/qmake.conf	Sun Oct 24 12:32:06 2010
+@@ -8,16 +8,17 @@ TEMPLATE		= app
 CONFIG			+= qt warn_on release link_prl
 QT			+= core gui
 
@ -21,7 +21,7 @@ $OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.8 2010/05/23 10:36:49 espie E
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= -fPIC
 QMAKE_CFLAGS_STATIC_LIB	= $$QMAKE_CFLAGS_SHLIB
-@@ -35,10 +36,10 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
+@@ -36,10 +37,10 @@ QMAKE_CXXFLAGS_STATIC_LIB = $$QMAKE_CFLAGS_STATIC_LIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
 QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
@ -36,7 +36,7 @@ $OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.8 2010/05/23 10:36:49 espie E
 QMAKE_INCDIR_QT		= $$[QT_INSTALL_HEADERS]
 QMAKE_LIBDIR_QT		= $$[QT_INSTALL_LIBS]
 QMAKE_INCDIR_OPENGL	= /usr/X11R6/include
-@@ -56,7 +57,7 @@ QMAKE_LFLAGS_RELEASE	=
+@@ -57,7 +58,7 @@ QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
--- a/x11/qt4/patches/patch-qmake_generators_unix_unixmake2_cpp
+++ b/x11/qt4/patches/patch-qmake_generators_unix_unixmake2_cpp
@ -1,9 +1,19 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2010/04/19 09:36:30 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig	Fri Nov 27 02:27:48 2009
-+++ qmake/generators/unix/unixmake2.cpp	Sun Dec  6 09:15:16 2009
-@@ -234,10 +234,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
-             t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y")) << endl;
-             t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
+$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.13 2010/10/28 14:55:47 espie Exp $
+--- qmake/generators/unix/unixmake2.cpp.orig	Fri Sep 10 11:04:41 2010
+++ qmake/generators/unix/unixmake2.cpp	Sun Oct 24 12:32:06 2010
+@@ -80,6 +80,9 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
+ {
+ 
+     writeHeader(t);
+    t << "LOCALBASE= " << LOCALBASE << endl
+      << "X11BASE  = " << X11BASE << endl << endl;
+    
+     if(!project->values("QMAKE_FAILED_REQUIREMENTS").isEmpty()) {
+         t << "QMAKE    = " << var("QMAKE_QMAKE") << endl;
+         QStringList &qut = project->values("QMAKE_EXTRA_TARGETS");
+@@ -242,10 +245,8 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+         } else if(!project->isEmpty("QMAKE_SYMBIAN_SHLIB")) {
+             t << "TARGETD       = " << escapeFilePath(var("TARGET")) << endl;
         } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
 -            t << "TARGETD       = " << escapeFilePath(var("TARGET_x.y.z")) << endl;
 -            t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
@ -14,7 +24,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2010/04/19 09:36:30 e
         } else {
             t << "TARGETD       = " << escapeFilePath(var("TARGET_x")) << endl;
             t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -547,31 +545,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -567,31 +568,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             t << endl << endl;
         } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
             t << "\n\t"
@ -49,18 +59,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2010/04/19 09:36:30 e
             if(!project->isEmpty("QMAKE_POST_LINK"))
                 t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
-@@ -875,9 +864,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) " << "$(TARGET)" << " " << endl;
-     } else {
-         t << "\t-$(DEL_FILE) " << "$(TARGET)" << " " << endl;
-     }
-@@ -975,6 +962,10 @@ void UnixMakefileGenerator::init2()
+@@ -997,6 +989,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]);
@ -71,7 +70,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.12 2010/04/19 09:36:30 e
     if(project->isEmpty("QMAKE_FRAMEWORK_VERSION"))
         project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first());
 
-@@ -1106,7 +1097,7 @@ void UnixMakefileGenerator::init2()
+@@ -1134,7 +1130,7 @@ void UnixMakefileGenerator::init2()
                                                             project->first("VER_MIN") +  "." +
                                                             project->first("VER_PAT"));
             }
--- a/x11/qt4/patches/patch-qmake_generators_unix_unixmake_cpp
+++ b/x11/qt4/patches/patch-qmake_generators_unix_unixmake_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.13 2010/04/19 09:36:30 espie Exp $
--- qmake/generators/unix/unixmake.cpp.orig	Fri Nov 27 02:27:48 2009
-+++ qmake/generators/unix/unixmake.cpp	Sun Dec  6 09:15:16 2009
-@@ -693,7 +693,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
+$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.14 2010/10/28 14:55:47 espie Exp $
+--- qmake/generators/unix/unixmake.cpp.orig	Fri Sep 10 11:04:41 2010
+++ qmake/generators/unix/unixmake.cpp	Sun Oct 24 12:32:06 2010
+@@ -699,7 +699,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")) {
--- a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue_h
+++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue_h
@ -1,22 +1,22 @@
-$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue_h,v 1.1 2010/06/15 21:27:57 landry Exp $
+$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_runtime_JSValue_h,v 1.2 2010/10/28 14:55:47 espie Exp $
 Fix build on sparc64, from netbsd x11/qt4-libs/patches/path-au
--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	Thu Jun 10 13:39:11 2010
-+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h	Thu Jun 10 13:39:29 2010
-@@ -468,7 +468,7 @@ namespace JSC {
+--- src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h.orig	Fri Sep 10 11:05:24 2010
+++ src/3rdparty/javascriptcore/JavaScriptCore/runtime/JSValue.h	Sun Oct 24 14:16:41 2010
+@@ -491,7 +491,7 @@ namespace JSC {
             u.asBits.tag = CellTag;
         else
             u.asBits.tag = EmptyValueTag;
 -        u.asBits.payload = reinterpret_cast<int32_t>(ptr);
 +        u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
-     }
- 
-     inline JSValue::JSValue(const JSCell* ptr)
-@@ -477,7 +477,7 @@ namespace JSC {
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
+@@ -503,7 +503,7 @@ namespace JSC {
             u.asBits.tag = CellTag;
         else
             u.asBits.tag = EmptyValueTag;
 -        u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
 +        u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
-     }
- 
-     inline JSValue::operator bool() const
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
--- a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_AlwaysInline_h
+++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_AlwaysInline_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_AlwaysInline_h,v 1.1 2010/04/19 09:36:30 espie Exp $
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/AlwaysInline.h.orig	Sun Dec  6 12:46:00 2009
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/AlwaysInline.h	Sun Dec  6 12:46:28 2009
+$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_AlwaysInline_h,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/AlwaysInline.h.orig	Fri Sep 10 11:05:23 2010
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/AlwaysInline.h	Sun Oct 24 12:32:06 2010
@@ -21,7 +21,7 @@
 #include "Platform.h"
 
@ -8,5 +8,5 @@ $OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_AlwaysInline_h,v
 -#if COMPILER(GCC) && defined(NDEBUG) && !COMPILER(MINGW)
 +#if COMPILER(GCC) && defined(NDEBUG) && !COMPILER(MINGW) && !PLATFORM(OPENBSD)
 #define ALWAYS_INLINE inline __attribute__((__always_inline__))
- #elif COMPILER(MSVC) && defined(NDEBUG)
+ #elif (COMPILER(MSVC) || COMPILER(RVCT)) && defined(NDEBUG)
 #define ALWAYS_INLINE __forceinline
--- a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
+++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
@ -1,12 +1,12 @@
-$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.3 2010/06/21 16:40:52 espie Exp $
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	Wed Jun  2 04:03:12 2010
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	Mon Jun 21 11:32:32 2010
-@@ -723,7 +723,7 @@
+$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.4 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	Fri Sep 10 11:05:23 2010
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	Sun Oct 24 14:17:40 2010
+@@ -870,7 +870,7 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
-#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX))
-+#if PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(SOLARIS) || PLATFORM(HPUX) || PLATFORM(OPENBSD))
- #define WTF_USE_JSVALUE64 1
- #elif (PLATFORM(IA64) && !PLATFORM(IA64_32)) || PLATFORM(SPARC64) || PLATFORM(ALPHA)
+-#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
+#if (CPU(X86_64) && (OS(UNIX) || OS(WINDOWS) || OS(SOLARIS) || OS(HPUX) || OS(OPENBSD))) || (CPU(IA64) && !CPU(IA64_32)) || CPU(ALPHA) || CPU(AIX64) || CPU(SPARC64)
 #define WTF_USE_JSVALUE64 1
+ #elif CPU(ARM) || CPU(PPC64)
+ #define WTF_USE_JSVALUE32 1
--- a/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
+++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h
@ -1,12 +1,12 @@
-$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v 1.1 2010/04/19 09:36:30 espie Exp $
--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig	Sun Dec  6 12:38:14 2009
-+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h	Sun Dec  6 12:39:49 2009
-@@ -228,7 +228,7 @@ inline int atomicDecrement(int volatile* addend) { ret
- inline int atomicIncrement(int volatile* addend) { return OSAtomicIncrement32Barrier(const_cast<int*>(addend)); }
- inline int atomicDecrement(int volatile* addend) { return OSAtomicDecrement32Barrier(const_cast<int*>(addend)); }
+$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig	Fri Sep 10 11:05:23 2010
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h	Sun Oct 24 14:18:33 2010
+@@ -239,7 +239,7 @@ inline int atomicDecrement(int volatile* addend) { ret
+ inline int atomicIncrement(int volatile* addend) { return android_atomic_inc(addend); }
+ inline int atomicDecrement(int volatile* addend) { return android_atomic_dec(addend); }
 
-#elif COMPILER(GCC) && !PLATFORM(SPARC64) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
-+#elif COMPILER(GCC) && !PLATFORM(SPARC64) && !PLATFORM(OPENBSD) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
+-#elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
+#elif COMPILER(GCC) && !CPU(SPARC64) && !OS(SYMBIAN) && !OS(OPENBSD) // sizeof(_Atomic_word) != sizeof(int) on sparc64 gcc
 #define WTF_USE_LOCKFREE_THREADSAFESHARED 1
 
 inline int atomicIncrement(int volatile* addend) { return __gnu_cxx::__exchange_and_add(addend, 1) + 1; }
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_JavaScriptCore_pro
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_JavaScriptCore_pro
@ -1,15 +1,15 @@
-$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_JavaScriptCore_pro,v 1.1 2010/05/23 10:36:49 espie Exp $
--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro.orig	Mon May 17 16:15:09 2010
-+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro	Mon May 17 16:15:18 2010
-@@ -26,9 +26,9 @@ INCLUDEPATH += $$GENERATED_SOURCES_DIR
- 
- !CONFIG(QTDIR_build) {
-     CONFIG(debug, debug|release) {
+$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_JavaScriptCore_pro,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro.orig	Fri Sep 10 11:05:22 2010
+++ src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro	Sun Oct 24 14:19:32 2010
+@@ -22,9 +22,9 @@ CONFIG(QTDIR_build) {
+     win32|mac:!macx-xcode:CONFIG += debug_and_release
+ } else {
+     !CONFIG(release, debug|release) {
 -        OBJECTS_DIR = obj/debug
 +        OBJECTS_DIR = .obj/debug
     } else { # Release
 -        OBJECTS_DIR = obj/release
 +        OBJECTS_DIR = .obj/release
     }
- }
- 
+     # Make sure that build_all follows the build_all config in WebCore
+     mac:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework):!build_pass:CONFIG += build_all
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp,v 1.3 2010/06/21 16:40:52 espie Exp $
--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig	Wed Jun  2 04:03:10 2010
-+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	Mon Jun 21 11:32:32 2010
-@@ -91,7 +91,7 @@ extern int *__libc_stack_end;
+$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp,v 1.4 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp.orig	Fri Sep 10 11:05:22 2010
+++ src/3rdparty/webkit/JavaScriptCore/runtime/Collector.cpp	Sun Oct 24 12:32:06 2010
+@@ -76,7 +76,7 @@
 #include <pthread.h>
 #endif
 
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_JSValue_h
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_runtime_JSValue_h
@ -1,22 +1,22 @@
-$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_JSValue_h,v 1.1 2010/06/15 21:27:57 landry Exp $
+$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_runtime_JSValue_h,v 1.2 2010/10/28 14:55:47 espie Exp $
 Fix build on sparc64, from netbsd x11/qt4-libs/patches/path-az
--- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig	Thu Jun 10 13:38:28 2010
-+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h	Thu Jun 10 13:38:54 2010
-@@ -476,7 +476,7 @@ namespace JSC {
+--- src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h.orig	Fri Sep 10 11:05:22 2010
+++ src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.h	Sun Oct 24 14:20:00 2010
+@@ -491,7 +491,7 @@ namespace JSC {
             u.asBits.tag = CellTag;
         else
             u.asBits.tag = EmptyValueTag;
 -        u.asBits.payload = reinterpret_cast<int32_t>(ptr);
 +        u.asBits.payload = reinterpret_cast<intptr_t>(ptr);
-     }
- 
-     inline JSValue::JSValue(const JSCell* ptr)
-@@ -485,7 +485,7 @@ namespace JSC {
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
+@@ -503,7 +503,7 @@ namespace JSC {
             u.asBits.tag = CellTag;
         else
             u.asBits.tag = EmptyValueTag;
 -        u.asBits.payload = reinterpret_cast<int32_t>(const_cast<JSCell*>(ptr));
 +        u.asBits.payload = reinterpret_cast<intptr_t>(const_cast<JSCell*>(ptr));
-     }
- 
-     inline JSValue::operator bool() const
+ #if ENABLE(JSC_ZOMBIES)
+         ASSERT(!isZombie());
+ #endif
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_StringExtras_h
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_wtf_StringExtras_h
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_3rdparty_webkit_JavaScriptCore_wtf_StringExtras_h,v 1.1 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h.orig	Sun Oct 24 15:34:37 2010
+++ src/3rdparty/webkit/JavaScriptCore/wtf/StringExtras.h	Sun Oct 24 15:34:49 2010
+@@ -86,7 +86,7 @@ inline int strcasecmp(const char* s1, const char* s2)
+ 
+ #endif
+ 
+-#if OS(WINDOWS) || OS(LINUX) || OS(SOLARIS)
+#if OS(WINDOWS) || OS(LINUX) || OS(SOLARIS) || OS(OPENBSD)
+ // FIXME: should check HAVE_STRNSTR
+ 
+ inline char* strnstr(const char* buffer, const char* target, size_t bufferLength)
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro
@ -1,16 +1,15 @@
-$OpenBSD: patch-src_3rdparty_webkit_WebCore_WebCore_pro,v 1.2 2010/06/21 16:40:52 espie Exp $
--- src/3rdparty/webkit/WebCore/WebCore.pro.orig	Wed Jun  2 04:03:11 2010
-+++ src/3rdparty/webkit/WebCore/WebCore.pro	Mon Jun 21 11:32:32 2010
-@@ -49,10 +49,10 @@ CONFIG(QTDIR_build) {
+$OpenBSD: patch-src_3rdparty_webkit_WebCore_WebCore_pro,v 1.3 2010/10/28 14:55:47 espie Exp $
+--- src/3rdparty/webkit/WebCore/WebCore.pro.orig	Fri Sep 10 11:05:18 2010
+++ src/3rdparty/webkit/WebCore/WebCore.pro	Sun Oct 24 14:20:31 2010
+@@ -67,9 +67,9 @@ CONFIG(standalone_package) {
+     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
 
-     CONFIG(debug, debug|release) {
-         isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}debug
+     !CONFIG(release, debug|release) {
 -        OBJECTS_DIR = obj/debug
 +        OBJECTS_DIR = .obj/debug
     } else { # Release
-         isEmpty(GENERATED_SOURCES_DIR):GENERATED_SOURCES_DIR = generated$${QMAKE_DIR_SEP}release
 -        OBJECTS_DIR = obj/release
 +        OBJECTS_DIR = .obj/release
     }
 
-     DESTDIR = $$OUTPUT_DIR/lib
+ }
--- a/x11/qt4/patches/patch-src_corelib_global_qglobal_h
+++ b/x11/qt4/patches/patch-src_corelib_global_qglobal_h
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.11 2010/06/21 16:40:52 espie Exp $
--- src/corelib/global/qglobal.h.orig	Wed Jun  2 04:03:17 2010
-+++ src/corelib/global/qglobal.h	Mon Jun 21 11:32:32 2010
-@@ -2216,7 +2216,7 @@ typedef uint Flags;
+$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.12 2010/10/28 14:55:47 espie Exp $
+--- src/corelib/global/qglobal.h.orig	Fri Sep 10 11:05:25 2010
+++ src/corelib/global/qglobal.h	Sun Oct 24 12:32:07 2010
+@@ -2230,7 +2230,7 @@ typedef uint Flags;
 
 #endif /* Q_NO_TYPESAFE_FLAGS */
 
--- a/x11/qt4/patches/patch-src_corelib_kernel_qmetaobject_cpp
+++ b/x11/qt4/patches/patch-src_corelib_kernel_qmetaobject_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_corelib_kernel_qmetaobject_cpp,v 1.2 2010/06/21 16:40:52 espie Exp $
--- src/corelib/kernel/qmetaobject.cpp.orig	Wed Jun  2 04:03:17 2010
-+++ src/corelib/kernel/qmetaobject.cpp	Mon Jun 21 11:34:44 2010
-@@ -943,7 +943,8 @@ QByteArray QMetaObject::normalizedType(const char *typ
+$OpenBSD: patch-src_corelib_kernel_qmetaobject_cpp,v 1.3 2010/10/28 14:55:47 espie Exp $
+--- src/corelib/kernel/qmetaobject.cpp.orig	Fri Sep 10 11:05:25 2010
+++ src/corelib/kernel/qmetaobject.cpp	Sun Oct 24 12:32:07 2010
+@@ -975,7 +975,8 @@ QByteArray QMetaObject::normalizedType(const char *typ
     if (!type || !*type)
         return result;
 
--- a/x11/qt4/patches/patch-src_gui_image_qmnghandler_pri
+++ b/x11/qt4/patches/patch-src_gui_image_qmnghandler_pri
@ -0,0 +1,12 @@
+$OpenBSD: patch-src_gui_image_qmnghandler_pri,v 1.1 2010/10/28 14:55:47 espie Exp $
+--- src/gui/image/qmnghandler.pri.orig	Sun Oct 24 14:22:26 2010
+++ src/gui/image/qmnghandler.pri	Sun Oct 24 14:22:42 2010
+@@ -3,7 +3,7 @@ INCLUDEPATH *= $$PWD
+ HEADERS += $$PWD/qmnghandler_p.h
+ SOURCES += $$PWD/qmnghandler.cpp
+ contains(QT_CONFIG, system-mng) {
+-        if(unix|win32-g++*):LIBS += -lmng
+        if(unix|win32-g++*):LIBS += -lmng -llcms -ljpeg -lz
+         else:win32:         LIBS += libmng.lib
+ } else {
+     include($$PWD/../../3rdparty/libmng.pri)
--- a/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp
+++ b/x11/qt4/patches/patch-src_gui_itemviews_qlistview_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.1 2010/04/19 09:36:30 espie Exp $
--- src/gui/itemviews/qlistview.cpp.orig	Thu Feb 11 16:55:22 2010
-+++ src/gui/itemviews/qlistview.cpp	Mon Mar  8 13:27:03 2010
-@@ -2821,7 +2821,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
+$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/gui/itemviews/qlistview.cpp.orig	Fri Sep 10 11:05:25 2010
+++ src/gui/itemviews/qlistview.cpp	Sun Oct 24 12:32:07 2010
+@@ -2833,7 +2833,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
     if (moved.count() != items.count())
         moved.resize(items.count());
 
--- a/x11/qt4/patches/patch-src_gui_painting_painting_pri
+++ b/x11/qt4/patches/patch-src_gui_painting_painting_pri
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_gui_painting_painting_pri,v 1.1 2010/06/21 16:40:52 espie Exp $
--- src/gui/painting/painting.pri.orig	Mon Jun 21 12:56:33 2010
-+++ src/gui/painting/painting.pri	Mon Jun 21 13:01:10 2010
-@@ -221,7 +221,7 @@ contains(QMAKE_MAC_XARCH, no) {
+$OpenBSD: patch-src_gui_painting_painting_pri,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/gui/painting/painting.pri.orig	Fri Sep 10 11:05:25 2010
+++ src/gui/painting/painting.pri	Sun Oct 24 12:32:07 2010
+@@ -225,7 +225,7 @@ contains(QMAKE_MAC_XARCH, no) {
 
         DEFINES += QT_HAVE_MMXEXT
     }
--- a/x11/qt4/patches/patch-src_gui_styles_qgtkstyle_p_cpp
+++ b/x11/qt4/patches/patch-src_gui_styles_qgtkstyle_p_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_gui_styles_qgtkstyle_p_cpp,v 1.1 2010/05/26 11:34:13 dcoppa Exp $
--- src/gui/styles/qgtkstyle_p.cpp.orig	Wed May 26 12:27:53 2010
-+++ src/gui/styles/qgtkstyle_p.cpp	Wed May 26 12:28:04 2010
-@@ -304,8 +304,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QString &pa
+$OpenBSD: patch-src_gui_styles_qgtkstyle_p_cpp,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/gui/styles/qgtkstyle_p.cpp.orig	Fri Sep 10 11:05:25 2010
+++ src/gui/styles/qgtkstyle_p.cpp	Sun Oct 24 12:32:07 2010
+@@ -309,8 +309,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLa
  */
 void QGtkStylePrivate::resolveGtk() const
 {
--- a/x11/qt4/patches/patch-src_plugins_graphicssystems_trace_qgraphicssystem_trace_cpp
+++ b/x11/qt4/patches/patch-src_plugins_graphicssystems_trace_qgraphicssystem_trace_cpp
@ -1,6 +1,6 @@
-$OpenBSD: patch-src_plugins_graphicssystems_trace_qgraphicssystem_trace_cpp,v 1.1 2010/04/19 09:36:30 espie Exp $
--- src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp.orig	Sun Dec  6 13:01:23 2009
-+++ src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp	Sun Dec  6 13:03:54 2009
+$OpenBSD: patch-src_plugins_graphicssystems_trace_qgraphicssystem_trace_cpp,v 1.2 2010/10/28 14:55:47 espie Exp $
+--- src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp.orig	Fri Sep 10 11:05:26 2010
+++ src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp	Sun Oct 24 12:32:07 2010
@@ -79,7 +79,9 @@ QTraceWindowSurface::QTraceWindowSurface(QWidget *widg
 QTraceWindowSurface::~QTraceWindowSurface()
 {
@ -11,4 +11,4 @@ $OpenBSD: patch-src_plugins_graphicssystems_trace_qgraphicssystem_trace_cpp,v 1.
 +        QFile outputFile(a_string.arg(winId));
         if (outputFile.open(QIODevice::WriteOnly)) {
             QDataStream out(&outputFile);
-             out.writeBytes("qttrace", 7);
+             out.setFloatingPointPrecision(QDataStream::SinglePrecision);
--- a/x11/qt4/patches/patch-src_plugins_imageformats_mng_mng_pro
+++ b/x11/qt4/patches/patch-src_plugins_imageformats_mng_mng_pro
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_plugins_imageformats_mng_mng_pro,v 1.3 2010/04/19 09:36:30 espie Exp $
--- src/plugins/imageformats/mng/mng.pro.orig	Fri Nov 27 02:27:53 2009
-+++ src/plugins/imageformats/mng/mng.pro	Sun Dec  6 09:15:16 2009
-@@ -14,7 +14,7 @@ symbian: {
- }
- 
- contains(QT_CONFIG, system-mng) {
-        unix:LIBS += -lmng
-+        unix:LIBS += -lmng -llcms -ljpeg -lz
-         win32:LIBS += libmng.lib
- }
- !contains(QT_CONFIG, system-mng) {
--- a/x11/qt4/patches/patch-tools_qdoc3_node_cpp
+++ b/x11/qt4/patches/patch-tools_qdoc3_node_cpp
@ -1,18 +0,0 @@
-$OpenBSD: patch-tools_qdoc3_node_cpp,v 1.1 2010/05/25 11:00:57 espie Exp $
--- tools/qdoc3/node.cpp.orig	Tue May 25 12:52:59 2010
-+++ tools/qdoc3/node.cpp	Tue May 25 12:55:06 2010
-@@ -590,12 +590,12 @@ void InnerNode::removeChild(Node *child)
- 	    secs.removeAll(child);
- 	}
-         QMap<QString, Node *>::Iterator ent = childMap.find( child->name() );
-        if ( *ent == child )
-+        if ( ent != childMap.end() && *ent == child )
-             childMap.erase( ent );
-     }
-     else {
- 	QMap<QString, Node *>::Iterator ent = childMap.find(child->name());
-	if (*ent == child)
-+	if (ent != childMap.end() && *ent == child)
- 	    childMap.erase(ent);
-     }
- }
--- a/x11/qt4/pkg/PFRAG.shared-examples
+++ b/x11/qt4/pkg/PFRAG.shared-examples
@ -1,4 +1,7 @@
-@comment $OpenBSD: PFRAG.shared-examples,v 1.5 2007/08/29 12:30:58 espie Exp $
+@comment $OpenBSD: PFRAG.shared-examples,v 1.6 2010/10/28 14:55:47 espie Exp $
+lib/qt4/examples/declarative/imageprovider/ImageProviderCore/libqmlimageproviderplugin.so
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/libqmlqtimeexampleplugin.so
+lib/qt4/examples/declarative/plugins/libqmlqwidgetsplugin.so
 lib/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
 lib/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
 lib/qt4/examples/tools/styleplugin/styles/libsimplestyleplugin.so
--- a/x11/qt4/pkg/PFRAG.shared-main
+++ b/x11/qt4/pkg/PFRAG.shared-main
@ -1,10 +1,10 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.7 2010/05/25 08:01:59 espie Exp $
+@comment $OpenBSD: PFRAG.shared-main,v 1.8 2010/10/28 14:55:47 espie Exp $
 %%GCC4%%
@lib lib/libQt3Support.so.${LIBQt3Support_VERSION}
-@lib lib/libQtAssistantClient.so.${LIBQtAssistantClient_VERSION}
@lib lib/libQtCLucene.so.${LIBQtCLucene_VERSION}
@lib lib/libQtCore.so.${LIBQtCore_VERSION}
@lib lib/libQtDBus.so.${LIBQtDBus_VERSION}
+@lib lib/libQtDeclarative.so.${LIBQtDeclarative_VERSION}
@lib lib/libQtDesigner.so.${LIBQtDesigner_VERSION}
@lib lib/libQtDesignerComponents.so.${LIBQtDesignerComponents_VERSION}
@lib lib/libQtGui.so.${LIBQtGui_VERSION}
@ -20,11 +20,15 @@
@lib lib/libQtXml.so.${LIBQtXml_VERSION}
@lib lib/libQtXmlPatterns.so.${LIBQtXmlPatterns_VERSION}
@lib lib/libphonon.so.${LIBphonon_VERSION}
+lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
+lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
+lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so
+lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
@lib lib/qt4/libQt3Support.so.${LIBQt3Support_VERSION}
-@lib lib/qt4/libQtAssistantClient.so.${LIBQtAssistantClient_VERSION}
@lib lib/qt4/libQtCLucene.so.${LIBQtCLucene_VERSION}
@lib lib/qt4/libQtCore.so.${LIBQtCore_VERSION}
@lib lib/qt4/libQtDBus.so.${LIBQtDBus_VERSION}
+@lib lib/qt4/libQtDeclarative.so.${LIBQtDeclarative_VERSION}
@lib lib/qt4/libQtDesigner.so.${LIBQtDesigner_VERSION}
@lib lib/qt4/libQtDesignerComponents.so.${LIBQtDesignerComponents_VERSION}
@lib lib/qt4/libQtGui.so.${LIBQtGui_VERSION}
@ -42,7 +46,10 @@
@lib lib/qt4/libphonon.so.${LIBphonon_VERSION}
 lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
 lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
+lib/qt4/plugins/bearer/libqgenericbearer.so
+lib/qt4/plugins/bearer/libqnmbearer.so
 lib/qt4/plugins/designer/libphononwidgets.so
+lib/qt4/plugins/designer/libqdeclarativeview.so
 lib/qt4/plugins/designer/libqt3supportwidgets.so
 lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
 lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
--- a/x11/qt4/pkg/PLIST-examples
+++ b/x11/qt4/pkg/PLIST-examples
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-examples,v 1.24 2010/06/21 16:40:52 espie Exp $
+@comment $OpenBSD: PLIST-examples,v 1.25 2010/10/28 14:55:47 espie Exp $
@conflict qt4-<=4.2.2
 %%SHARED%%
 %%GCC4%%
@ -115,6 +115,200 @@ lib/qt4/demos/composition/composition.qrc
 lib/qt4/demos/composition/flower.jpg
 lib/qt4/demos/composition/flower_alpha.jpg
 lib/qt4/demos/composition/main.cpp
+lib/qt4/demos/declarative/
+lib/qt4/demos/declarative/calculator/
+lib/qt4/demos/declarative/calculator/Core/
+lib/qt4/demos/declarative/calculator/Core/Button.qml
+lib/qt4/demos/declarative/calculator/Core/Display.qml
+lib/qt4/demos/declarative/calculator/Core/calculator.js
+lib/qt4/demos/declarative/calculator/Core/images/
+lib/qt4/demos/declarative/calculator/Core/images/button-.png
+lib/qt4/demos/declarative/calculator/Core/images/button-blue.png
+lib/qt4/demos/declarative/calculator/Core/images/button-green.png
+lib/qt4/demos/declarative/calculator/Core/images/button-purple.png
+lib/qt4/demos/declarative/calculator/Core/images/button-red.png
+lib/qt4/demos/declarative/calculator/Core/images/display.png
+lib/qt4/demos/declarative/calculator/Core/qmldir
+lib/qt4/demos/declarative/calculator/calculator.qml
+lib/qt4/demos/declarative/calculator/calculator.qmlproject
+lib/qt4/demos/declarative/flickr/
+lib/qt4/demos/declarative/flickr/common/
+lib/qt4/demos/declarative/flickr/common/Progress.qml
+lib/qt4/demos/declarative/flickr/common/RssModel.qml
+lib/qt4/demos/declarative/flickr/common/ScrollBar.qml
+lib/qt4/demos/declarative/flickr/common/Slider.qml
+lib/qt4/demos/declarative/flickr/common/qmldir
+lib/qt4/demos/declarative/flickr/flickr-90.qml
+lib/qt4/demos/declarative/flickr/flickr.qml
+lib/qt4/demos/declarative/flickr/flickr.qmlproject
+lib/qt4/demos/declarative/flickr/mobile/
+lib/qt4/demos/declarative/flickr/mobile/Button.qml
+lib/qt4/demos/declarative/flickr/mobile/GridDelegate.qml
+lib/qt4/demos/declarative/flickr/mobile/ImageDetails.qml
+lib/qt4/demos/declarative/flickr/mobile/ListDelegate.qml
+lib/qt4/demos/declarative/flickr/mobile/TitleBar.qml
+lib/qt4/demos/declarative/flickr/mobile/ToolBar.qml
+lib/qt4/demos/declarative/flickr/mobile/images/
+lib/qt4/demos/declarative/flickr/mobile/images/gloss.png
+lib/qt4/demos/declarative/flickr/mobile/images/lineedit.png
+lib/qt4/demos/declarative/flickr/mobile/images/lineedit.sci
+lib/qt4/demos/declarative/flickr/mobile/images/quit.png
+lib/qt4/demos/declarative/flickr/mobile/images/stripes.png
+lib/qt4/demos/declarative/flickr/mobile/images/titlebar.png
+lib/qt4/demos/declarative/flickr/mobile/images/titlebar.sci
+lib/qt4/demos/declarative/flickr/mobile/images/toolbutton.png
+lib/qt4/demos/declarative/flickr/mobile/images/toolbutton.sci
+lib/qt4/demos/declarative/minehunt/
+lib/qt4/demos/declarative/minehunt/MinehuntCore/
+lib/qt4/demos/declarative/minehunt/MinehuntCore/Explosion.qml
+lib/qt4/demos/declarative/minehunt/MinehuntCore/Tile.qml
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/No-Ones-Laughing-3.jpg
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/back.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/bomb-color.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/bomb.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/face-sad.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/face-smile-big.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/face-smile.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/flag-color.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/flag.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/front.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/quit.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/pics/star.png
+lib/qt4/demos/declarative/minehunt/MinehuntCore/qmldir
+@bin lib/qt4/demos/declarative/minehunt/minehunt
+lib/qt4/demos/declarative/minehunt/minehunt.pro
+lib/qt4/demos/declarative/minehunt/minehunt.qml
+lib/qt4/demos/declarative/photoviewer/
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/AlbumDelegate.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/BusyIndicator.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/Button.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/EditableButton.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/ProgressBar.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/RssModel.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/Tag.qml
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/images/
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/images/box-shadow.png
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/images/busy.png
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/images/cardboard.png
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/qmldir
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/script/
+lib/qt4/demos/declarative/photoviewer/PhotoViewerCore/script/script.js
+lib/qt4/demos/declarative/photoviewer/i18n/
+lib/qt4/demos/declarative/photoviewer/i18n/base.ts
+lib/qt4/demos/declarative/photoviewer/i18n/qml_fr.qm
+lib/qt4/demos/declarative/photoviewer/i18n/qml_fr.ts
+lib/qt4/demos/declarative/photoviewer/photoviewer.qml
+lib/qt4/demos/declarative/photoviewer/photoviewer.qmlproject
+lib/qt4/demos/declarative/rssnews/
+lib/qt4/demos/declarative/rssnews/content/
+lib/qt4/demos/declarative/rssnews/content/BusyIndicator.qml
+lib/qt4/demos/declarative/rssnews/content/CategoryDelegate.qml
+lib/qt4/demos/declarative/rssnews/content/NewsDelegate.qml
+lib/qt4/demos/declarative/rssnews/content/RssFeeds.qml
+lib/qt4/demos/declarative/rssnews/content/ScrollBar.qml
+lib/qt4/demos/declarative/rssnews/content/images/
+lib/qt4/demos/declarative/rssnews/content/images/busy.png
+lib/qt4/demos/declarative/rssnews/content/images/scrollbar.png
+lib/qt4/demos/declarative/rssnews/rssnews.qml
+lib/qt4/demos/declarative/rssnews/rssnews.qmlproject
+lib/qt4/demos/declarative/samegame/
+lib/qt4/demos/declarative/samegame/SamegameCore/
+lib/qt4/demos/declarative/samegame/SamegameCore/BoomBlock.qml
+lib/qt4/demos/declarative/samegame/SamegameCore/Button.qml
+lib/qt4/demos/declarative/samegame/SamegameCore/Dialog.qml
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/background.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/blueStar.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/blueStone.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/greenStar.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/greenStone.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/redStar.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/redStone.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/star.png
+lib/qt4/demos/declarative/samegame/SamegameCore/pics/yellowStone.png
+lib/qt4/demos/declarative/samegame/SamegameCore/qmldir
+lib/qt4/demos/declarative/samegame/SamegameCore/samegame.js
+lib/qt4/demos/declarative/samegame/highscores/
+lib/qt4/demos/declarative/samegame/highscores/README
+lib/qt4/demos/declarative/samegame/highscores/score_data.xml
+lib/qt4/demos/declarative/samegame/highscores/score_style.xsl
+lib/qt4/demos/declarative/samegame/highscores/scores.php
+lib/qt4/demos/declarative/samegame/samegame.qml
+lib/qt4/demos/declarative/samegame/samegame.qmlproject
+lib/qt4/demos/declarative/snake/
+lib/qt4/demos/declarative/snake/content/
+lib/qt4/demos/declarative/snake/content/Button.qml
+lib/qt4/demos/declarative/snake/content/Cookie.qml
+lib/qt4/demos/declarative/snake/content/HighScoreModel.qml
+lib/qt4/demos/declarative/snake/content/Link.qml
+lib/qt4/demos/declarative/snake/content/Skull.qml
+lib/qt4/demos/declarative/snake/content/pics/
+lib/qt4/demos/declarative/snake/content/pics/README
+lib/qt4/demos/declarative/snake/content/pics/background.png
+lib/qt4/demos/declarative/snake/content/pics/blueStar.png
+lib/qt4/demos/declarative/snake/content/pics/blueStone.png
+lib/qt4/demos/declarative/snake/content/pics/cookie.png
+lib/qt4/demos/declarative/snake/content/pics/eyes.svg
+lib/qt4/demos/declarative/snake/content/pics/head.png
+lib/qt4/demos/declarative/snake/content/pics/head.svg
+lib/qt4/demos/declarative/snake/content/pics/redStar.png
+lib/qt4/demos/declarative/snake/content/pics/redStone.png
+lib/qt4/demos/declarative/snake/content/pics/skull.png
+lib/qt4/demos/declarative/snake/content/pics/snake.jpg
+lib/qt4/demos/declarative/snake/content/pics/star.png
+lib/qt4/demos/declarative/snake/content/pics/stoneShadow.png
+lib/qt4/demos/declarative/snake/content/pics/yellowStar.png
+lib/qt4/demos/declarative/snake/content/pics/yellowStone.png
+lib/qt4/demos/declarative/snake/content/snake.js
+lib/qt4/demos/declarative/snake/snake.qml
+lib/qt4/demos/declarative/snake/snake.qmlproject
+lib/qt4/demos/declarative/twitter/
+lib/qt4/demos/declarative/twitter/TwitterCore/
+lib/qt4/demos/declarative/twitter/TwitterCore/Button.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/FatDelegate.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/Input.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/Loading.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/MultiTitleBar.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/RssModel.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/SearchView.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/TitleBar.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/ToolBar.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/UserModel.qml
+lib/qt4/demos/declarative/twitter/TwitterCore/images/
+lib/qt4/demos/declarative/twitter/TwitterCore/images/gloss.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/lineedit.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/lineedit.sci
+lib/qt4/demos/declarative/twitter/TwitterCore/images/loading.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/quit.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/stripes.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/titlebar.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/titlebar.sci
+lib/qt4/demos/declarative/twitter/TwitterCore/images/toolbutton.png
+lib/qt4/demos/declarative/twitter/TwitterCore/images/toolbutton.sci
+lib/qt4/demos/declarative/twitter/TwitterCore/qmldir
+lib/qt4/demos/declarative/twitter/twitter.qml
+lib/qt4/demos/declarative/twitter/twitter.qmlproject
+lib/qt4/demos/declarative/webbrowser/
+lib/qt4/demos/declarative/webbrowser/content/
+lib/qt4/demos/declarative/webbrowser/content/Button.qml
+lib/qt4/demos/declarative/webbrowser/content/FlickableWebView.qml
+lib/qt4/demos/declarative/webbrowser/content/Header.qml
+lib/qt4/demos/declarative/webbrowser/content/ScrollBar.qml
+lib/qt4/demos/declarative/webbrowser/content/UrlInput.qml
+lib/qt4/demos/declarative/webbrowser/content/pics/
+lib/qt4/demos/declarative/webbrowser/content/pics/display.png
+lib/qt4/demos/declarative/webbrowser/content/pics/edit-delete.png
+lib/qt4/demos/declarative/webbrowser/content/pics/go-jump-locationbar.png
+lib/qt4/demos/declarative/webbrowser/content/pics/go-next-view.png
+lib/qt4/demos/declarative/webbrowser/content/pics/go-previous-view.png
+lib/qt4/demos/declarative/webbrowser/content/pics/scrollbar.png
+lib/qt4/demos/declarative/webbrowser/content/pics/titlebar-bg.png
+lib/qt4/demos/declarative/webbrowser/content/pics/view-refresh.png
+lib/qt4/demos/declarative/webbrowser/webbrowser.qml
+lib/qt4/demos/declarative/webbrowser/webbrowser.qmlproject
 lib/qt4/demos/deform/
@bin lib/qt4/demos/deform/deform
 lib/qt4/demos/deform/deform.pro
@ -602,35 +796,6 @@ lib/qt4/examples/animation/stickman/stickman.cpp
 lib/qt4/examples/animation/stickman/stickman.h
 lib/qt4/examples/animation/stickman/stickman.pro
 lib/qt4/examples/animation/stickman/stickman.qrc
-lib/qt4/examples/assistant/
-lib/qt4/examples/assistant/README
-lib/qt4/examples/assistant/assistant.pro
-lib/qt4/examples/assistant/simpletextviewer/
-lib/qt4/examples/assistant/simpletextviewer/documentation/
-lib/qt4/examples/assistant/simpletextviewer/documentation/about.txt
-lib/qt4/examples/assistant/simpletextviewer/documentation/browse.html
-lib/qt4/examples/assistant/simpletextviewer/documentation/filedialog.html
-lib/qt4/examples/assistant/simpletextviewer/documentation/findfile.html
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/browse.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/fadedfilemenu.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/filedialog.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/handbook.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/mainwindow.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/open.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/images/wildcard.png
-lib/qt4/examples/assistant/simpletextviewer/documentation/index.html
-lib/qt4/examples/assistant/simpletextviewer/documentation/intro.html
-lib/qt4/examples/assistant/simpletextviewer/documentation/openfile.html
-lib/qt4/examples/assistant/simpletextviewer/documentation/simpletextviewer.adp
-lib/qt4/examples/assistant/simpletextviewer/documentation/wildcardmatching.html
-lib/qt4/examples/assistant/simpletextviewer/findfiledialog.cpp
-lib/qt4/examples/assistant/simpletextviewer/findfiledialog.h
-lib/qt4/examples/assistant/simpletextviewer/main.cpp
-lib/qt4/examples/assistant/simpletextviewer/mainwindow.cpp
-lib/qt4/examples/assistant/simpletextviewer/mainwindow.h
-@bin lib/qt4/examples/assistant/simpletextviewer/simpletextviewer
-lib/qt4/examples/assistant/simpletextviewer/simpletextviewer.pro
 lib/qt4/examples/dbus/
 lib/qt4/examples/dbus/chat/
 lib/qt4/examples/dbus/chat/chat.cpp
@ -678,12 +843,12 @@ lib/qt4/examples/dbus/remotecontrolledcar/car/car.h
 lib/qt4/examples/dbus/remotecontrolledcar/car/car.pro
 lib/qt4/examples/dbus/remotecontrolledcar/car/car.xml
 lib/qt4/examples/dbus/remotecontrolledcar/car/car_adaptor.cpp
-lib/qt4/examples/dbus/remotecontrolledcar/car/car_adaptor_p.h
+lib/qt4/examples/dbus/remotecontrolledcar/car/car_adaptor.h
 lib/qt4/examples/dbus/remotecontrolledcar/car/main.cpp
 lib/qt4/examples/dbus/remotecontrolledcar/controller/
 lib/qt4/examples/dbus/remotecontrolledcar/controller/car.xml
 lib/qt4/examples/dbus/remotecontrolledcar/controller/car_interface.cpp
-lib/qt4/examples/dbus/remotecontrolledcar/controller/car_interface_p.h
+lib/qt4/examples/dbus/remotecontrolledcar/controller/car_interface.h
@bin lib/qt4/examples/dbus/remotecontrolledcar/controller/controller
 lib/qt4/examples/dbus/remotecontrolledcar/controller/controller.cpp
 lib/qt4/examples/dbus/remotecontrolledcar/controller/controller.h
@ -691,6 +856,514 @@ lib/qt4/examples/dbus/remotecontrolledcar/controller/controller.pro
 lib/qt4/examples/dbus/remotecontrolledcar/controller/controller.ui
 lib/qt4/examples/dbus/remotecontrolledcar/controller/main.cpp
 lib/qt4/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro
+lib/qt4/examples/declarative/
+lib/qt4/examples/declarative/animation/
+lib/qt4/examples/declarative/animation/animation.qmlproject
+lib/qt4/examples/declarative/animation/basics/
+lib/qt4/examples/declarative/animation/basics/basics.qmlproject
+lib/qt4/examples/declarative/animation/basics/color-animation.qml
+lib/qt4/examples/declarative/animation/basics/images/
+lib/qt4/examples/declarative/animation/basics/images/face-smile.png
+lib/qt4/examples/declarative/animation/basics/images/moon.png
+lib/qt4/examples/declarative/animation/basics/images/shadow.png
+lib/qt4/examples/declarative/animation/basics/images/star.png
+lib/qt4/examples/declarative/animation/basics/images/sun.png
+lib/qt4/examples/declarative/animation/basics/property-animation.qml
+lib/qt4/examples/declarative/animation/behaviors/
+lib/qt4/examples/declarative/animation/behaviors/SideRect.qml
+lib/qt4/examples/declarative/animation/behaviors/behavior-example.qml
+lib/qt4/examples/declarative/animation/behaviors/behaviors.qmlproject
+lib/qt4/examples/declarative/animation/easing/
+lib/qt4/examples/declarative/animation/easing/easing.qml
+lib/qt4/examples/declarative/animation/easing/easing.qmlproject
+lib/qt4/examples/declarative/animation/states/
+lib/qt4/examples/declarative/animation/states/states.qml
+lib/qt4/examples/declarative/animation/states/states.qmlproject
+lib/qt4/examples/declarative/animation/states/transitions.qml
+lib/qt4/examples/declarative/animation/states/user.png
+lib/qt4/examples/declarative/cppextensions/
+lib/qt4/examples/declarative/cppextensions/cppextensions.pro
+lib/qt4/examples/declarative/cppextensions/cppextensions.qmlproject
+lib/qt4/examples/declarative/cppextensions/imageprovider/
+lib/qt4/examples/declarative/cppextensions/imageprovider/ImageProviderCore/
+lib/qt4/examples/declarative/cppextensions/imageprovider/ImageProviderCore/qmldir
+lib/qt4/examples/declarative/cppextensions/imageprovider/imageprovider-example.qml
+lib/qt4/examples/declarative/cppextensions/imageprovider/imageprovider.cpp
+lib/qt4/examples/declarative/cppextensions/imageprovider/imageprovider.pro
+lib/qt4/examples/declarative/cppextensions/imageprovider/imageprovider.qmlproject
+lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/
+lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/main.cpp
+lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.pro
+lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qmlproject
+lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/networkaccessmanagerfactory.qrc
+lib/qt4/examples/declarative/cppextensions/networkaccessmanagerfactory/view.qml
+lib/qt4/examples/declarative/cppextensions/plugins/
+lib/qt4/examples/declarative/cppextensions/plugins/README
+lib/qt4/examples/declarative/cppextensions/plugins/com/
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/Clock.qml
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/center.png
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/clock.png
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/hour.png
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/minute.png
+lib/qt4/examples/declarative/cppextensions/plugins/com/nokia/TimeExample/qmldir
+lib/qt4/examples/declarative/cppextensions/plugins/plugin.cpp
+lib/qt4/examples/declarative/cppextensions/plugins/plugins.pro
+lib/qt4/examples/declarative/cppextensions/plugins/plugins.qml
+lib/qt4/examples/declarative/cppextensions/plugins/plugins.qmlproject
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.pro
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qmlproject
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qrc
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/main.cpp
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.h
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.qrc
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/main.cpp
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.pro
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qgraphicsgridlayout.qml
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.pro
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslayouts.qmlproject
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.cpp
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.h
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/linearlayout.qrc
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/main.cpp
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.pro
+lib/qt4/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qgraphicslinearlayout.qml
+lib/qt4/examples/declarative/cppextensions/qwidgets/
+lib/qt4/examples/declarative/cppextensions/qwidgets/QWidgets/
+lib/qt4/examples/declarative/cppextensions/qwidgets/QWidgets/qmldir
+lib/qt4/examples/declarative/cppextensions/qwidgets/README
+lib/qt4/examples/declarative/cppextensions/qwidgets/qwidgets.cpp
+lib/qt4/examples/declarative/cppextensions/qwidgets/qwidgets.pro
+lib/qt4/examples/declarative/cppextensions/qwidgets/qwidgets.qml
+lib/qt4/examples/declarative/cppextensions/qwidgets/qwidgets.qmlproject
+lib/qt4/examples/declarative/cppextensions/referenceexamples/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/adding.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/adding.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/adding/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/attached.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/attached.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/attached/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/binding.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/binding.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/binding/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/coercion.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/coercion/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/default.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/default.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/default/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/extended.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/extended.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/lineedit.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/extended/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/grouped.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/grouped/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/properties.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/properties/properties.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/referenceexamples.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/referenceexamples.qmlproject
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/signal.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/signal/signal.qrc
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/person.cpp
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/person.h
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro
+lib/qt4/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.qrc
+lib/qt4/examples/declarative/extending/
+lib/qt4/examples/declarative/extending/adding/
+@bin lib/qt4/examples/declarative/extending/adding/adding
+lib/qt4/examples/declarative/extending/adding/adding.pro
+lib/qt4/examples/declarative/extending/adding/adding.qrc
+lib/qt4/examples/declarative/extending/adding/main.cpp
+lib/qt4/examples/declarative/extending/adding/person.cpp
+lib/qt4/examples/declarative/extending/adding/person.h
+lib/qt4/examples/declarative/extending/attached/
+@bin lib/qt4/examples/declarative/extending/attached/attached
+lib/qt4/examples/declarative/extending/attached/attached.pro
+lib/qt4/examples/declarative/extending/attached/attached.qrc
+lib/qt4/examples/declarative/extending/attached/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/attached/birthdayparty.h
+lib/qt4/examples/declarative/extending/attached/main.cpp
+lib/qt4/examples/declarative/extending/attached/person.cpp
+lib/qt4/examples/declarative/extending/attached/person.h
+lib/qt4/examples/declarative/extending/binding/
+@bin lib/qt4/examples/declarative/extending/binding/binding
+lib/qt4/examples/declarative/extending/binding/binding.pro
+lib/qt4/examples/declarative/extending/binding/binding.qrc
+lib/qt4/examples/declarative/extending/binding/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/binding/birthdayparty.h
+lib/qt4/examples/declarative/extending/binding/happybirthdaysong.cpp
+lib/qt4/examples/declarative/extending/binding/happybirthdaysong.h
+lib/qt4/examples/declarative/extending/binding/main.cpp
+lib/qt4/examples/declarative/extending/binding/person.cpp
+lib/qt4/examples/declarative/extending/binding/person.h
+lib/qt4/examples/declarative/extending/coercion/
+lib/qt4/examples/declarative/extending/coercion/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/coercion/birthdayparty.h
+@bin lib/qt4/examples/declarative/extending/coercion/coercion
+lib/qt4/examples/declarative/extending/coercion/coercion.pro
+lib/qt4/examples/declarative/extending/coercion/coercion.qrc
+lib/qt4/examples/declarative/extending/coercion/main.cpp
+lib/qt4/examples/declarative/extending/coercion/person.cpp
+lib/qt4/examples/declarative/extending/coercion/person.h
+lib/qt4/examples/declarative/extending/default/
+lib/qt4/examples/declarative/extending/default/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/default/birthdayparty.h
+@bin lib/qt4/examples/declarative/extending/default/default
+lib/qt4/examples/declarative/extending/default/default.pro
+lib/qt4/examples/declarative/extending/default/default.qrc
+lib/qt4/examples/declarative/extending/default/main.cpp
+lib/qt4/examples/declarative/extending/default/person.cpp
+lib/qt4/examples/declarative/extending/default/person.h
+lib/qt4/examples/declarative/extending/extended/
+@bin lib/qt4/examples/declarative/extending/extended/extended
+lib/qt4/examples/declarative/extending/extended/extended.pro
+lib/qt4/examples/declarative/extending/extended/extended.qrc
+lib/qt4/examples/declarative/extending/extended/lineedit.cpp
+lib/qt4/examples/declarative/extending/extended/lineedit.h
+lib/qt4/examples/declarative/extending/extended/main.cpp
+lib/qt4/examples/declarative/extending/grouped/
+lib/qt4/examples/declarative/extending/grouped/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/grouped/birthdayparty.h
+@bin lib/qt4/examples/declarative/extending/grouped/grouped
+lib/qt4/examples/declarative/extending/grouped/grouped.pro
+lib/qt4/examples/declarative/extending/grouped/grouped.qrc
+lib/qt4/examples/declarative/extending/grouped/main.cpp
+lib/qt4/examples/declarative/extending/grouped/person.cpp
+lib/qt4/examples/declarative/extending/grouped/person.h
+lib/qt4/examples/declarative/extending/properties/
+lib/qt4/examples/declarative/extending/properties/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/properties/birthdayparty.h
+lib/qt4/examples/declarative/extending/properties/main.cpp
+lib/qt4/examples/declarative/extending/properties/person.cpp
+lib/qt4/examples/declarative/extending/properties/person.h
+@bin lib/qt4/examples/declarative/extending/properties/properties
+lib/qt4/examples/declarative/extending/properties/properties.pro
+lib/qt4/examples/declarative/extending/properties/properties.qrc
+lib/qt4/examples/declarative/extending/signal/
+lib/qt4/examples/declarative/extending/signal/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/signal/birthdayparty.h
+lib/qt4/examples/declarative/extending/signal/main.cpp
+lib/qt4/examples/declarative/extending/signal/person.cpp
+lib/qt4/examples/declarative/extending/signal/person.h
+@bin lib/qt4/examples/declarative/extending/signal/signal
+lib/qt4/examples/declarative/extending/signal/signal.pro
+lib/qt4/examples/declarative/extending/signal/signal.qrc
+lib/qt4/examples/declarative/extending/valuesource/
+lib/qt4/examples/declarative/extending/valuesource/birthdayparty.cpp
+lib/qt4/examples/declarative/extending/valuesource/birthdayparty.h
+lib/qt4/examples/declarative/extending/valuesource/happybirthdaysong.cpp
+lib/qt4/examples/declarative/extending/valuesource/happybirthdaysong.h
+lib/qt4/examples/declarative/extending/valuesource/main.cpp
+lib/qt4/examples/declarative/extending/valuesource/person.cpp
+lib/qt4/examples/declarative/extending/valuesource/person.h
+@bin lib/qt4/examples/declarative/extending/valuesource/valuesource
+lib/qt4/examples/declarative/extending/valuesource/valuesource.pro
+lib/qt4/examples/declarative/extending/valuesource/valuesource.qrc
+lib/qt4/examples/declarative/i18n/
+lib/qt4/examples/declarative/i18n/i18n/
+lib/qt4/examples/declarative/i18n/i18n.qml
+lib/qt4/examples/declarative/i18n/i18n.qmlproject
+lib/qt4/examples/declarative/i18n/i18n/base.ts
+lib/qt4/examples/declarative/i18n/i18n/qml_en_AU.qm
+lib/qt4/examples/declarative/i18n/i18n/qml_en_AU.ts
+lib/qt4/examples/declarative/i18n/i18n/qml_fr.qm
+lib/qt4/examples/declarative/i18n/i18n/qml_fr.ts
+lib/qt4/examples/declarative/imageelements/
+lib/qt4/examples/declarative/imageelements/borderimage/
+lib/qt4/examples/declarative/imageelements/borderimage/borderimage.qml
+lib/qt4/examples/declarative/imageelements/borderimage/borderimage.qmlproject
+lib/qt4/examples/declarative/imageelements/borderimage/content/
+lib/qt4/examples/declarative/imageelements/borderimage/content/MyBorderImage.qml
+lib/qt4/examples/declarative/imageelements/borderimage/content/ShadowRectangle.qml
+lib/qt4/examples/declarative/imageelements/borderimage/content/bw.png
+lib/qt4/examples/declarative/imageelements/borderimage/content/colors-round.sci
+lib/qt4/examples/declarative/imageelements/borderimage/content/colors-stretch.sci
+lib/qt4/examples/declarative/imageelements/borderimage/content/colors.png
+lib/qt4/examples/declarative/imageelements/borderimage/content/shadow.png
+lib/qt4/examples/declarative/imageelements/borderimage/shadows.qml
+lib/qt4/examples/declarative/imageelements/image/
+lib/qt4/examples/declarative/imageelements/image/ImageCell.qml
+lib/qt4/examples/declarative/imageelements/image/face-smile.png
+lib/qt4/examples/declarative/imageelements/image/image.qml
+lib/qt4/examples/declarative/imageelements/image/image.qmlproject
+lib/qt4/examples/declarative/imageelements/imageelements.qmlproject
+lib/qt4/examples/declarative/imageprovider/
+lib/qt4/examples/declarative/imageprovider/ImageProviderCore/
+lib/qt4/examples/declarative/imageprovider/ImageProviderCore/qmldir
+lib/qt4/examples/declarative/imageprovider/imageprovider.cpp
+lib/qt4/examples/declarative/imageprovider/imageprovider.pro
+lib/qt4/examples/declarative/keyinteraction/
+lib/qt4/examples/declarative/keyinteraction/focus/
+lib/qt4/examples/declarative/keyinteraction/focus/Core/
+lib/qt4/examples/declarative/keyinteraction/focus/Core/ContextMenu.qml
+lib/qt4/examples/declarative/keyinteraction/focus/Core/GridMenu.qml
+lib/qt4/examples/declarative/keyinteraction/focus/Core/ListMenu.qml
+lib/qt4/examples/declarative/keyinteraction/focus/Core/ListViewDelegate.qml
+lib/qt4/examples/declarative/keyinteraction/focus/Core/images/
+lib/qt4/examples/declarative/keyinteraction/focus/Core/images/arrow.png
+lib/qt4/examples/declarative/keyinteraction/focus/Core/images/qt-logo.png
+lib/qt4/examples/declarative/keyinteraction/focus/focus.qml
+lib/qt4/examples/declarative/keyinteraction/focus/focus.qmlproject
+lib/qt4/examples/declarative/keyinteraction/keyinteraction.qmlproject
+lib/qt4/examples/declarative/objectlistmodel/
+lib/qt4/examples/declarative/objectlistmodel/dataobject.cpp
+lib/qt4/examples/declarative/objectlistmodel/dataobject.h
+lib/qt4/examples/declarative/objectlistmodel/main.cpp
+@bin lib/qt4/examples/declarative/objectlistmodel/objectlistmodel
+lib/qt4/examples/declarative/objectlistmodel/objectlistmodel.pro
+lib/qt4/examples/declarative/objectlistmodel/objectlistmodel.qrc
+lib/qt4/examples/declarative/objectlistmodel/view.qml
+lib/qt4/examples/declarative/plugins/
+lib/qt4/examples/declarative/plugins/README
+lib/qt4/examples/declarative/plugins/com/
+lib/qt4/examples/declarative/plugins/com/nokia/
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/Clock.qml
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/center.png
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/clock.png
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/hour.png
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/minute.png
+lib/qt4/examples/declarative/plugins/com/nokia/TimeExample/qmldir
+lib/qt4/examples/declarative/plugins/plugin.cpp
+lib/qt4/examples/declarative/plugins/plugins.pro
+lib/qt4/examples/declarative/plugins/plugins.qml
+lib/qt4/examples/declarative/plugins/qwidgets.cpp
+lib/qt4/examples/declarative/plugins/qwidgets.pro
+lib/qt4/examples/declarative/plugins/qwidgets.qml
+lib/qt4/examples/declarative/positioners/
+lib/qt4/examples/declarative/positioners/Button.qml
+lib/qt4/examples/declarative/positioners/add.png
+lib/qt4/examples/declarative/positioners/del.png
+lib/qt4/examples/declarative/positioners/positioners.qml
+lib/qt4/examples/declarative/positioners/positioners.qmlproject
+lib/qt4/examples/declarative/positioners/positioners.qmlproject.user
+lib/qt4/examples/declarative/sqllocalstorage/
+lib/qt4/examples/declarative/sqllocalstorage/hello.qml
+lib/qt4/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
+lib/qt4/examples/declarative/text/
+lib/qt4/examples/declarative/text/fonts/
+lib/qt4/examples/declarative/text/fonts/availableFonts.qml
+lib/qt4/examples/declarative/text/fonts/banner.qml
+lib/qt4/examples/declarative/text/fonts/fonts/
+lib/qt4/examples/declarative/text/fonts/fonts.qml
+lib/qt4/examples/declarative/text/fonts/fonts.qmlproject
+lib/qt4/examples/declarative/text/fonts/fonts/tarzeau_ocr_a.ttf
+lib/qt4/examples/declarative/text/fonts/hello.qml
+lib/qt4/examples/declarative/text/text.qmlproject
+lib/qt4/examples/declarative/text/textselection/
+lib/qt4/examples/declarative/text/textselection/pics/
+lib/qt4/examples/declarative/text/textselection/pics/endHandle.png
+lib/qt4/examples/declarative/text/textselection/pics/endHandle.sci
+lib/qt4/examples/declarative/text/textselection/pics/startHandle.png
+lib/qt4/examples/declarative/text/textselection/pics/startHandle.sci
+lib/qt4/examples/declarative/text/textselection/textselection.qml
+lib/qt4/examples/declarative/text/textselection/textselection.qmlproject
+lib/qt4/examples/declarative/threading/
+lib/qt4/examples/declarative/threading/threadedlistmodel/
+lib/qt4/examples/declarative/threading/threadedlistmodel/dataloader.js
+lib/qt4/examples/declarative/threading/threadedlistmodel/threadedlistmodel.qmlproject
+lib/qt4/examples/declarative/threading/threadedlistmodel/timedisplay.qml
+lib/qt4/examples/declarative/threading/threading.qmlproject
+lib/qt4/examples/declarative/threading/workerscript/
+lib/qt4/examples/declarative/threading/workerscript/workerscript.js
+lib/qt4/examples/declarative/threading/workerscript/workerscript.qml
+lib/qt4/examples/declarative/threading/workerscript/workerscript.qmlproject
+lib/qt4/examples/declarative/touchinteraction/
+lib/qt4/examples/declarative/touchinteraction/gestures/
+lib/qt4/examples/declarative/touchinteraction/gestures/experimental-gestures.qml
+lib/qt4/examples/declarative/touchinteraction/gestures/gestures.qmlproject
+lib/qt4/examples/declarative/touchinteraction/mousearea/
+lib/qt4/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
+lib/qt4/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject
+lib/qt4/examples/declarative/touchinteraction/touchinteraction.qmlproject
+lib/qt4/examples/declarative/toys/
+lib/qt4/examples/declarative/toys/README
+lib/qt4/examples/declarative/toys/clocks/
+lib/qt4/examples/declarative/toys/clocks/clocks.qml
+lib/qt4/examples/declarative/toys/clocks/clocks.qmlproject
+lib/qt4/examples/declarative/toys/clocks/content/
+lib/qt4/examples/declarative/toys/clocks/content/Clock.qml
+lib/qt4/examples/declarative/toys/clocks/content/background.png
+lib/qt4/examples/declarative/toys/clocks/content/center.png
+lib/qt4/examples/declarative/toys/clocks/content/clock-night.png
+lib/qt4/examples/declarative/toys/clocks/content/clock.png
+lib/qt4/examples/declarative/toys/clocks/content/hour.png
+lib/qt4/examples/declarative/toys/clocks/content/minute.png
+lib/qt4/examples/declarative/toys/clocks/content/second.png
+lib/qt4/examples/declarative/toys/corkboards/
+lib/qt4/examples/declarative/toys/corkboards/Day.qml
+lib/qt4/examples/declarative/toys/corkboards/cork.jpg
+lib/qt4/examples/declarative/toys/corkboards/corkboards.qml
+lib/qt4/examples/declarative/toys/corkboards/corkboards.qmlproject
+lib/qt4/examples/declarative/toys/corkboards/note-yellow.png
+lib/qt4/examples/declarative/toys/corkboards/tack.png
+lib/qt4/examples/declarative/toys/dynamicscene/
+lib/qt4/examples/declarative/toys/dynamicscene/dynamicscene.qml
+lib/qt4/examples/declarative/toys/dynamicscene/dynamicscene.qmlproject
+lib/qt4/examples/declarative/toys/dynamicscene/images/
+lib/qt4/examples/declarative/toys/dynamicscene/images/NOTE
+lib/qt4/examples/declarative/toys/dynamicscene/images/face-smile.png
+lib/qt4/examples/declarative/toys/dynamicscene/images/moon.png
+lib/qt4/examples/declarative/toys/dynamicscene/images/rabbit_brown.png
+lib/qt4/examples/declarative/toys/dynamicscene/images/rabbit_bw.png
+lib/qt4/examples/declarative/toys/dynamicscene/images/star.png
+lib/qt4/examples/declarative/toys/dynamicscene/images/sun.png
+lib/qt4/examples/declarative/toys/dynamicscene/images/tree_s.png
+lib/qt4/examples/declarative/toys/dynamicscene/qml/
+lib/qt4/examples/declarative/toys/dynamicscene/qml/Button.qml
+lib/qt4/examples/declarative/toys/dynamicscene/qml/GenericSceneItem.qml
+lib/qt4/examples/declarative/toys/dynamicscene/qml/PaletteItem.qml
+lib/qt4/examples/declarative/toys/dynamicscene/qml/PerspectiveItem.qml
+lib/qt4/examples/declarative/toys/dynamicscene/qml/Sun.qml
+lib/qt4/examples/declarative/toys/dynamicscene/qml/itemCreation.js
+lib/qt4/examples/declarative/toys/tic-tac-toe/
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/Button.qml
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/TicTac.qml
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/pics/
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/pics/board.png
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/pics/o.png
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/pics/x.png
+lib/qt4/examples/declarative/toys/tic-tac-toe/content/tic-tac-toe.js
+lib/qt4/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qml
+lib/qt4/examples/declarative/toys/tic-tac-toe/tic-tac-toe.qmlproject
+lib/qt4/examples/declarative/toys/toys.qmlproject
+lib/qt4/examples/declarative/toys/tvtennis/
+lib/qt4/examples/declarative/toys/tvtennis/tvtennis.qml
+lib/qt4/examples/declarative/toys/tvtennis/tvtennis.qmlproject
+lib/qt4/examples/declarative/ui-components/
+lib/qt4/examples/declarative/ui-components/README
+lib/qt4/examples/declarative/ui-components/dialcontrol/
+lib/qt4/examples/declarative/ui-components/dialcontrol/content/
+lib/qt4/examples/declarative/ui-components/dialcontrol/content/Dial.qml
+lib/qt4/examples/declarative/ui-components/dialcontrol/content/background.png
+lib/qt4/examples/declarative/ui-components/dialcontrol/content/needle.png
+lib/qt4/examples/declarative/ui-components/dialcontrol/content/needle_shadow.png
+lib/qt4/examples/declarative/ui-components/dialcontrol/content/overlay.png
+lib/qt4/examples/declarative/ui-components/dialcontrol/dialcontrol.qml
+lib/qt4/examples/declarative/ui-components/dialcontrol/dialcontrol.qmlproject
+lib/qt4/examples/declarative/ui-components/flipable/
+lib/qt4/examples/declarative/ui-components/flipable/content/
+lib/qt4/examples/declarative/ui-components/flipable/content/5_heart.png
+lib/qt4/examples/declarative/ui-components/flipable/content/9_club.png
+lib/qt4/examples/declarative/ui-components/flipable/content/Card.qml
+lib/qt4/examples/declarative/ui-components/flipable/content/back.png
+lib/qt4/examples/declarative/ui-components/flipable/flipable.qml
+lib/qt4/examples/declarative/ui-components/flipable/flipable.qmlproject
+lib/qt4/examples/declarative/ui-components/progressbar/
+lib/qt4/examples/declarative/ui-components/progressbar/content/
+lib/qt4/examples/declarative/ui-components/progressbar/content/ProgressBar.qml
+lib/qt4/examples/declarative/ui-components/progressbar/content/background.png
+lib/qt4/examples/declarative/ui-components/progressbar/main.qml
+lib/qt4/examples/declarative/ui-components/progressbar/progressbar.qmlproject
+lib/qt4/examples/declarative/ui-components/scrollbar/
+lib/qt4/examples/declarative/ui-components/scrollbar/ScrollBar.qml
+lib/qt4/examples/declarative/ui-components/scrollbar/main.qml
+lib/qt4/examples/declarative/ui-components/scrollbar/pics/
+lib/qt4/examples/declarative/ui-components/scrollbar/pics/niagara_falls.jpg
+lib/qt4/examples/declarative/ui-components/scrollbar/scrollbar.qmlproject
+lib/qt4/examples/declarative/ui-components/searchbox/
+lib/qt4/examples/declarative/ui-components/searchbox/SearchBox.qml
+lib/qt4/examples/declarative/ui-components/searchbox/images/
+lib/qt4/examples/declarative/ui-components/searchbox/images/clear.png
+lib/qt4/examples/declarative/ui-components/searchbox/images/lineedit-bg-focus.png
+lib/qt4/examples/declarative/ui-components/searchbox/images/lineedit-bg.png
+lib/qt4/examples/declarative/ui-components/searchbox/main.qml
+lib/qt4/examples/declarative/ui-components/searchbox/searchbox.qmlproject
+lib/qt4/examples/declarative/ui-components/slideswitch/
+lib/qt4/examples/declarative/ui-components/slideswitch/content/
+lib/qt4/examples/declarative/ui-components/slideswitch/content/Switch.qml
+lib/qt4/examples/declarative/ui-components/slideswitch/content/background.svg
+lib/qt4/examples/declarative/ui-components/slideswitch/content/knob.svg
+lib/qt4/examples/declarative/ui-components/slideswitch/slideswitch.qml
+lib/qt4/examples/declarative/ui-components/slideswitch/slideswitch.qmlproject
+lib/qt4/examples/declarative/ui-components/spinner/
+lib/qt4/examples/declarative/ui-components/spinner/content/
+lib/qt4/examples/declarative/ui-components/spinner/content/Spinner.qml
+lib/qt4/examples/declarative/ui-components/spinner/content/spinner-bg.png
+lib/qt4/examples/declarative/ui-components/spinner/content/spinner-select.png
+lib/qt4/examples/declarative/ui-components/spinner/main.qml
+lib/qt4/examples/declarative/ui-components/spinner/spinner.qmlproject
+lib/qt4/examples/declarative/ui-components/tabwidget/
+lib/qt4/examples/declarative/ui-components/tabwidget/TabWidget.qml
+lib/qt4/examples/declarative/ui-components/tabwidget/main.qml
+lib/qt4/examples/declarative/ui-components/tabwidget/tab.png
+lib/qt4/examples/declarative/ui-components/tabwidget/tabwidget.qmlproject
+lib/qt4/examples/declarative/ui-components/ui-components.qmlproject
+lib/qt4/examples/declarative/xml/
+lib/qt4/examples/declarative/xml/xml.qmlproject
+lib/qt4/examples/declarative/xml/xmlhttprequest/
+lib/qt4/examples/declarative/xml/xmlhttprequest/data.xml
+lib/qt4/examples/declarative/xml/xmlhttprequest/xmlhttprequest-example.qml
+lib/qt4/examples/declarative/xml/xmlhttprequest/xmlhttprequest.qmlproject
 lib/qt4/examples/designer/
 lib/qt4/examples/designer/README
 lib/qt4/examples/designer/calculatorbuilder/
@ -1005,7 +1678,9 @@ lib/qt4/examples/graphicsview/elasticnodes/node.cpp
 lib/qt4/examples/graphicsview/elasticnodes/node.h
 lib/qt4/examples/graphicsview/graphicsview.pro
 lib/qt4/examples/graphicsview/padnavigator/
-lib/qt4/examples/graphicsview/padnavigator/backside.ui
+lib/qt4/examples/graphicsview/padnavigator/flippablepad.cpp
+lib/qt4/examples/graphicsview/padnavigator/flippablepad.h
+lib/qt4/examples/graphicsview/padnavigator/form.ui
 lib/qt4/examples/graphicsview/padnavigator/images/
 lib/qt4/examples/graphicsview/padnavigator/images/artsfftscope.png
 lib/qt4/examples/graphicsview/padnavigator/images/blue_angle_swirl.jpg
@ -1018,10 +1693,10 @@ lib/qt4/examples/graphicsview/padnavigator/images/metacontact_online.png
 lib/qt4/examples/graphicsview/padnavigator/images/minitools.png
 lib/qt4/examples/graphicsview/padnavigator/main.cpp
@bin lib/qt4/examples/graphicsview/padnavigator/padnavigator
+lib/qt4/examples/graphicsview/padnavigator/padnavigator.cpp
+lib/qt4/examples/graphicsview/padnavigator/padnavigator.h
 lib/qt4/examples/graphicsview/padnavigator/padnavigator.pro
 lib/qt4/examples/graphicsview/padnavigator/padnavigator.qrc
-lib/qt4/examples/graphicsview/padnavigator/panel.cpp
-lib/qt4/examples/graphicsview/padnavigator/panel.h
 lib/qt4/examples/graphicsview/padnavigator/roundrectitem.cpp
 lib/qt4/examples/graphicsview/padnavigator/roundrectitem.h
 lib/qt4/examples/graphicsview/padnavigator/splashitem.cpp
@ -1667,26 +2342,6 @@ lib/qt4/examples/multimedia/videowidget/videowidget.h
 lib/qt4/examples/multimedia/videowidget/videowidget.pro
 lib/qt4/examples/multimedia/videowidget/videowidgetsurface.cpp
 lib/qt4/examples/multimedia/videowidget/videowidgetsurface.h
-lib/qt4/examples/multitouch/
-lib/qt4/examples/multitouch/fingerpaint/
-@bin lib/qt4/examples/multitouch/fingerpaint/fingerpaint
-lib/qt4/examples/multitouch/fingerpaint/fingerpaint.pro
-lib/qt4/examples/multitouch/fingerpaint/main.cpp
-lib/qt4/examples/multitouch/fingerpaint/mainwindow.cpp
-lib/qt4/examples/multitouch/fingerpaint/mainwindow.h
-lib/qt4/examples/multitouch/fingerpaint/scribblearea.cpp
-lib/qt4/examples/multitouch/fingerpaint/scribblearea.h
-lib/qt4/examples/multitouch/pinchzoom/
-lib/qt4/examples/multitouch/pinchzoom/graphicsview.cpp
-lib/qt4/examples/multitouch/pinchzoom/graphicsview.h
-lib/qt4/examples/multitouch/pinchzoom/images/
-lib/qt4/examples/multitouch/pinchzoom/images/cheese.jpg
-lib/qt4/examples/multitouch/pinchzoom/main.cpp
-lib/qt4/examples/multitouch/pinchzoom/mice.qrc
-lib/qt4/examples/multitouch/pinchzoom/mouse.cpp
-lib/qt4/examples/multitouch/pinchzoom/mouse.h
-@bin lib/qt4/examples/multitouch/pinchzoom/pinchzoom
-lib/qt4/examples/multitouch/pinchzoom/pinchzoom.pro
 lib/qt4/examples/network/
 lib/qt4/examples/network/README
 lib/qt4/examples/network/blockingfortuneclient/
@ -2207,7 +2862,6 @@ lib/qt4/examples/script/qstetrix/tetrixboard.h
 lib/qt4/examples/script/qstetrix/tetrixboard.js
 lib/qt4/examples/script/qstetrix/tetrixpiece.js
 lib/qt4/examples/script/qstetrix/tetrixwindow.js
-lib/qt4/examples/script/qstetrix/tetrixwindow.ui
 lib/qt4/examples/script/script.pro
 lib/qt4/examples/sql/
 lib/qt4/examples/sql/README
@ -2344,8 +2998,8 @@ lib/qt4/examples/tools/completer/
@bin lib/qt4/examples/tools/completer/completer
 lib/qt4/examples/tools/completer/completer.pro
 lib/qt4/examples/tools/completer/completer.qrc
-lib/qt4/examples/tools/completer/dirmodel.cpp
-lib/qt4/examples/tools/completer/dirmodel.h
+lib/qt4/examples/tools/completer/fsmodel.cpp
+lib/qt4/examples/tools/completer/fsmodel.h
 lib/qt4/examples/tools/completer/main.cpp
 lib/qt4/examples/tools/completer/mainwindow.cpp
 lib/qt4/examples/tools/completer/mainwindow.h
@ -2516,6 +3170,37 @@ lib/qt4/examples/tools/undoframework/mainwindow.h
@bin lib/qt4/examples/tools/undoframework/undoframework
 lib/qt4/examples/tools/undoframework/undoframework.pro
 lib/qt4/examples/tools/undoframework/undoframework.qrc
+lib/qt4/examples/touch/
+lib/qt4/examples/touch/dials/
+@bin lib/qt4/examples/touch/dials/dials
+lib/qt4/examples/touch/dials/dials.pro
+lib/qt4/examples/touch/dials/dials.ui
+lib/qt4/examples/touch/dials/main.cpp
+lib/qt4/examples/touch/fingerpaint/
+@bin lib/qt4/examples/touch/fingerpaint/fingerpaint
+lib/qt4/examples/touch/fingerpaint/fingerpaint.pro
+lib/qt4/examples/touch/fingerpaint/main.cpp
+lib/qt4/examples/touch/fingerpaint/mainwindow.cpp
+lib/qt4/examples/touch/fingerpaint/mainwindow.h
+lib/qt4/examples/touch/fingerpaint/scribblearea.cpp
+lib/qt4/examples/touch/fingerpaint/scribblearea.h
+lib/qt4/examples/touch/knobs/
+lib/qt4/examples/touch/knobs/knob.cpp
+lib/qt4/examples/touch/knobs/knob.h
+@bin lib/qt4/examples/touch/knobs/knobs
+lib/qt4/examples/touch/knobs/knobs.pro
+lib/qt4/examples/touch/knobs/main.cpp
+lib/qt4/examples/touch/pinchzoom/
+lib/qt4/examples/touch/pinchzoom/graphicsview.cpp
+lib/qt4/examples/touch/pinchzoom/graphicsview.h
+lib/qt4/examples/touch/pinchzoom/images/
+lib/qt4/examples/touch/pinchzoom/images/cheese.jpg
+lib/qt4/examples/touch/pinchzoom/main.cpp
+lib/qt4/examples/touch/pinchzoom/mice.qrc
+lib/qt4/examples/touch/pinchzoom/mouse.cpp
+lib/qt4/examples/touch/pinchzoom/mouse.h
+@bin lib/qt4/examples/touch/pinchzoom/pinchzoom
+lib/qt4/examples/touch/pinchzoom/pinchzoom.pro
 lib/qt4/examples/tutorials/
 lib/qt4/examples/tutorials/README
 lib/qt4/examples/tutorials/addressbook/
--- a/x11/qt4/pkg/PLIST-html
+++ b/x11/qt4/pkg/PLIST-html
--- a/x11/qt4/pkg/PLIST-main
+++ b/x11/qt4/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.26 2010/06/21 16:40:52 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.27 2010/10/28 14:55:47 espie Exp $
@pkgpath x11/qt4
@pkgpath x11/qt4,-phonon
 %%SHARED%%
@ -23,6 +23,7 @@ include/X11/qt4/Qt/
 include/X11/qt4/Qt/Qt3Support
 include/X11/qt4/Qt/QtCore
 include/X11/qt4/Qt/QtDBus
+include/X11/qt4/Qt/QtDeclarative
 include/X11/qt4/Qt/QtGui
 include/X11/qt4/Qt/QtHelp
 include/X11/qt4/Qt/QtMultimedia
@ -213,6 +214,7 @@ include/X11/qt4/Qt/qauthenticator.h
 include/X11/qt4/Qt/qbasicatomic.h
 include/X11/qt4/Qt/qbasictimer.h
 include/X11/qt4/Qt/qbenchmark.h
+include/X11/qt4/Qt/qbenchmarkmetric.h
 include/X11/qt4/Qt/qbitarray.h
 include/X11/qt4/Qt/qbitmap.h
 include/X11/qt4/Qt/qboxlayout.h
@ -271,6 +273,27 @@ include/X11/qt4/Qt/qdbusreply.h
 include/X11/qt4/Qt/qdbusserver.h
 include/X11/qt4/Qt/qdbusservicewatcher.h
 include/X11/qt4/Qt/qdebug.h
+include/X11/qt4/Qt/qdeclarative.h
+include/X11/qt4/Qt/qdeclarativecomponent.h
+include/X11/qt4/Qt/qdeclarativecontext.h
+include/X11/qt4/Qt/qdeclarativeengine.h
+include/X11/qt4/Qt/qdeclarativeerror.h
+include/X11/qt4/Qt/qdeclarativeexpression.h
+include/X11/qt4/Qt/qdeclarativeextensioninterface.h
+include/X11/qt4/Qt/qdeclarativeextensionplugin.h
+include/X11/qt4/Qt/qdeclarativeimageprovider.h
+include/X11/qt4/Qt/qdeclarativeinfo.h
+include/X11/qt4/Qt/qdeclarativeitem.h
+include/X11/qt4/Qt/qdeclarativelist.h
+include/X11/qt4/Qt/qdeclarativenetworkaccessmanagerfactory.h
+include/X11/qt4/Qt/qdeclarativeparserstatus.h
+include/X11/qt4/Qt/qdeclarativeprivate.h
+include/X11/qt4/Qt/qdeclarativeproperty.h
+include/X11/qt4/Qt/qdeclarativepropertymap.h
+include/X11/qt4/Qt/qdeclarativepropertyvalueinterceptor.h
+include/X11/qt4/Qt/qdeclarativepropertyvaluesource.h
+include/X11/qt4/Qt/qdeclarativescriptstring.h
+include/X11/qt4/Qt/qdeclarativeview.h
 include/X11/qt4/Qt/qdecoration_qws.h
 include/X11/qt4/Qt/qdecorationdefault_qws.h
 include/X11/qt4/Qt/qdecorationfactory_qws.h
@ -291,6 +314,7 @@ include/X11/qt4/Qt/qdom.h
 include/X11/qt4/Qt/qdrag.h
 include/X11/qt4/Qt/qdrawutil.h
 include/X11/qt4/Qt/qeasingcurve.h
+include/X11/qt4/Qt/qelapsedtimer.h
 include/X11/qt4/Qt/qendian.h
 include/X11/qt4/Qt/qerrormessage.h
 include/X11/qt4/Qt/qevent.h
@ -326,6 +350,7 @@ include/X11/qt4/Qt/qgenericmatrix.h
 include/X11/qt4/Qt/qgesture.h
 include/X11/qt4/Qt/qgesturerecognizer.h
 include/X11/qt4/Qt/qgl.h
+include/X11/qt4/Qt/qglbuffer.h
 include/X11/qt4/Qt/qglcolormap.h
 include/X11/qt4/Qt/qglframebufferobject.h
 include/X11/qt4/Qt/qglobal.h
@ -442,6 +467,8 @@ include/X11/qt4/Qt/qmovie.h
 include/X11/qt4/Qt/qmutex.h
 include/X11/qt4/Qt/qnamespace.h
 include/X11/qt4/Qt/qnetworkaccessmanager.h
+include/X11/qt4/Qt/qnetworkconfigmanager.h
+include/X11/qt4/Qt/qnetworkconfiguration.h
 include/X11/qt4/Qt/qnetworkcookie.h
 include/X11/qt4/Qt/qnetworkcookiejar.h
 include/X11/qt4/Qt/qnetworkdiskcache.h
@ -449,6 +476,7 @@ include/X11/qt4/Qt/qnetworkinterface.h
 include/X11/qt4/Qt/qnetworkproxy.h
 include/X11/qt4/Qt/qnetworkreply.h
 include/X11/qt4/Qt/qnetworkrequest.h
+include/X11/qt4/Qt/qnetworksession.h
 include/X11/qt4/Qt/qnumeric.h
 include/X11/qt4/Qt/qobject.h
 include/X11/qt4/Qt/qobjectcleanuphandler.h
@ -589,6 +617,7 @@ include/X11/qt4/Qt/qstackedwidget.h
 include/X11/qt4/Qt/qstandarditemmodel.h
 include/X11/qt4/Qt/qstate.h
 include/X11/qt4/Qt/qstatemachine.h
+include/X11/qt4/Qt/qstatictext.h
 include/X11/qt4/Qt/qstatusbar.h
 include/X11/qt4/Qt/qstring.h
 include/X11/qt4/Qt/qstringbuilder.h
@ -1035,11 +1064,6 @@ include/X11/qt4/Qt3Support/q3whatsthis.h
 include/X11/qt4/Qt3Support/q3widgetstack.h
 include/X11/qt4/Qt3Support/q3wizard.h
 include/X11/qt4/Qt3Support/qiconset.h
-include/X11/qt4/QtAssistant/
-include/X11/qt4/QtAssistant/QAssistantClient
-include/X11/qt4/QtAssistant/QtAssistant
-include/X11/qt4/QtAssistant/qassistantclient.h
-include/X11/qt4/QtAssistant/qassistantclient_global.h
 include/X11/qt4/QtCore/
 include/X11/qt4/QtCore/QAbstractAnimation
 include/X11/qt4/QtCore/QAbstractConcatenable
@ -1087,6 +1111,7 @@ include/X11/qt4/QtCore/QDir
 include/X11/qt4/QtCore/QDirIterator
 include/X11/qt4/QtCore/QDynamicPropertyChangeEvent
 include/X11/qt4/QtCore/QEasingCurve
+include/X11/qt4/QtCore/QElapsedTimer
 include/X11/qt4/QtCore/QEvent
 include/X11/qt4/QtCore/QEventLoop
 include/X11/qt4/QtCore/QEventTransition
@ -1300,6 +1325,7 @@ include/X11/qt4/QtCore/QtCleanUpFunction
 include/X11/qt4/QtCore/QtConcurrentFilter
 include/X11/qt4/QtCore/QtConcurrentMap
 include/X11/qt4/QtCore/QtConcurrentRun
+include/X11/qt4/QtCore/QtConfig
 include/X11/qt4/QtCore/QtContainerFwd
 include/X11/qt4/QtCore/QtCore
 include/X11/qt4/QtCore/QtDebug
@ -1365,6 +1391,7 @@ include/X11/qt4/QtCore/qdebug.h
 include/X11/qt4/QtCore/qdir.h
 include/X11/qt4/QtCore/qdiriterator.h
 include/X11/qt4/QtCore/qeasingcurve.h
+include/X11/qt4/QtCore/qelapsedtimer.h
 include/X11/qt4/QtCore/qendian.h
 include/X11/qt4/QtCore/qeventloop.h
 include/X11/qt4/QtCore/qeventtransition.h
@ -1515,6 +1542,52 @@ include/X11/qt4/QtDBus/qdbuspendingreply.h
 include/X11/qt4/QtDBus/qdbusreply.h
 include/X11/qt4/QtDBus/qdbusserver.h
 include/X11/qt4/QtDBus/qdbusservicewatcher.h
+include/X11/qt4/QtDeclarative/
+include/X11/qt4/QtDeclarative/QDeclarativeAttachedPropertiesFunc
+include/X11/qt4/QtDeclarative/QDeclarativeComponent
+include/X11/qt4/QtDeclarative/QDeclarativeContext
+include/X11/qt4/QtDeclarative/QDeclarativeEngine
+include/X11/qt4/QtDeclarative/QDeclarativeError
+include/X11/qt4/QtDeclarative/QDeclarativeExpression
+include/X11/qt4/QtDeclarative/QDeclarativeExtensionInterface
+include/X11/qt4/QtDeclarative/QDeclarativeExtensionPlugin
+include/X11/qt4/QtDeclarative/QDeclarativeImageProvider
+include/X11/qt4/QtDeclarative/QDeclarativeInfo
+include/X11/qt4/QtDeclarative/QDeclarativeItem
+include/X11/qt4/QtDeclarative/QDeclarativeListProperty
+include/X11/qt4/QtDeclarative/QDeclarativeListReference
+include/X11/qt4/QtDeclarative/QDeclarativeNetworkAccessManagerFactory
+include/X11/qt4/QtDeclarative/QDeclarativeParserStatus
+include/X11/qt4/QtDeclarative/QDeclarativeProperties
+include/X11/qt4/QtDeclarative/QDeclarativeProperty
+include/X11/qt4/QtDeclarative/QDeclarativePropertyMap
+include/X11/qt4/QtDeclarative/QDeclarativePropertyValueInterceptor
+include/X11/qt4/QtDeclarative/QDeclarativePropertyValueSource
+include/X11/qt4/QtDeclarative/QDeclarativeScriptString
+include/X11/qt4/QtDeclarative/QDeclarativeTypeInfo
+include/X11/qt4/QtDeclarative/QDeclarativeView
+include/X11/qt4/QtDeclarative/QtDeclarative
+include/X11/qt4/QtDeclarative/qdeclarative.h
+include/X11/qt4/QtDeclarative/qdeclarativecomponent.h
+include/X11/qt4/QtDeclarative/qdeclarativecontext.h
+include/X11/qt4/QtDeclarative/qdeclarativeengine.h
+include/X11/qt4/QtDeclarative/qdeclarativeerror.h
+include/X11/qt4/QtDeclarative/qdeclarativeexpression.h
+include/X11/qt4/QtDeclarative/qdeclarativeextensioninterface.h
+include/X11/qt4/QtDeclarative/qdeclarativeextensionplugin.h
+include/X11/qt4/QtDeclarative/qdeclarativeimageprovider.h
+include/X11/qt4/QtDeclarative/qdeclarativeinfo.h
+include/X11/qt4/QtDeclarative/qdeclarativeitem.h
+include/X11/qt4/QtDeclarative/qdeclarativelist.h
+include/X11/qt4/QtDeclarative/qdeclarativenetworkaccessmanagerfactory.h
+include/X11/qt4/QtDeclarative/qdeclarativeparserstatus.h
+include/X11/qt4/QtDeclarative/qdeclarativeprivate.h
+include/X11/qt4/QtDeclarative/qdeclarativeproperty.h
+include/X11/qt4/QtDeclarative/qdeclarativepropertymap.h
+include/X11/qt4/QtDeclarative/qdeclarativepropertyvalueinterceptor.h
+include/X11/qt4/QtDeclarative/qdeclarativepropertyvaluesource.h
+include/X11/qt4/QtDeclarative/qdeclarativescriptstring.h
+include/X11/qt4/QtDeclarative/qdeclarativeview.h
 include/X11/qt4/QtDesigner/
 include/X11/qt4/QtDesigner/QAbstractExtensionFactory
 include/X11/qt4/QtDesigner/QAbstractExtensionManager
@ -1890,8 +1963,15 @@ include/X11/qt4/QtGui/QResizeEvent
 include/X11/qt4/QtGui/QRgb
 include/X11/qt4/QtGui/QRubberBand
 include/X11/qt4/QtGui/QS60MainAppUi
+include/X11/qt4/QtGui/QS60MainAppUiBase
 include/X11/qt4/QtGui/QS60MainApplication
+include/X11/qt4/QtGui/QS60MainApplicationBase
 include/X11/qt4/QtGui/QS60MainDocument
+include/X11/qt4/QtGui/QS60MainDocumentBase
+include/X11/qt4/QtGui/QS60StubAknAppUi
+include/X11/qt4/QtGui/QS60StubAknAppUiBase
+include/X11/qt4/QtGui/QS60StubMAknTouchPaneObserver
+include/X11/qt4/QtGui/QS60StubMEikStatusPaneObserver
 include/X11/qt4/QtGui/QS60Style
 include/X11/qt4/QtGui/QScreen
 include/X11/qt4/QtGui/QScreenCursor
@ -1919,6 +1999,7 @@ include/X11/qt4/QtGui/QStackedWidget
 include/X11/qt4/QtGui/QStandardItem
 include/X11/qt4/QtGui/QStandardItemEditorCreator
 include/X11/qt4/QtGui/QStandardItemModel
+include/X11/qt4/QtGui/QStaticText
 include/X11/qt4/QtGui/QStatusBar
 include/X11/qt4/QtGui/QStatusTipEvent
 include/X11/qt4/QtGui/QStringListModel
@ -2314,6 +2395,7 @@ include/X11/qt4/QtGui/qsplitter.h
 include/X11/qt4/QtGui/qstackedlayout.h
 include/X11/qt4/QtGui/qstackedwidget.h
 include/X11/qt4/QtGui/qstandarditemmodel.h
+include/X11/qt4/QtGui/qstatictext.h
 include/X11/qt4/QtGui/qstatusbar.h
 include/X11/qt4/QtGui/qstringlistmodel.h
 include/X11/qt4/QtGui/qstyle.h
@ -2450,6 +2532,8 @@ include/X11/qt4/QtNetwork/QLocalSocket
 include/X11/qt4/QtNetwork/QNetworkAccessManager
 include/X11/qt4/QtNetwork/QNetworkAddressEntry
 include/X11/qt4/QtNetwork/QNetworkCacheMetaData
+include/X11/qt4/QtNetwork/QNetworkConfiguration
+include/X11/qt4/QtNetwork/QNetworkConfigurationManager
 include/X11/qt4/QtNetwork/QNetworkCookie
 include/X11/qt4/QtNetwork/QNetworkCookieJar
 include/X11/qt4/QtNetwork/QNetworkDiskCache
@ -2459,6 +2543,7 @@ include/X11/qt4/QtNetwork/QNetworkProxyFactory
 include/X11/qt4/QtNetwork/QNetworkProxyQuery
 include/X11/qt4/QtNetwork/QNetworkReply
 include/X11/qt4/QtNetwork/QNetworkRequest
+include/X11/qt4/QtNetwork/QNetworkSession
 include/X11/qt4/QtNetwork/QSsl
 include/X11/qt4/QtNetwork/QSslCertificate
 include/X11/qt4/QtNetwork/QSslCipher
@ -2482,6 +2567,8 @@ include/X11/qt4/QtNetwork/qhttp.h
 include/X11/qt4/QtNetwork/qlocalserver.h
 include/X11/qt4/QtNetwork/qlocalsocket.h
 include/X11/qt4/QtNetwork/qnetworkaccessmanager.h
+include/X11/qt4/QtNetwork/qnetworkconfigmanager.h
+include/X11/qt4/QtNetwork/qnetworkconfiguration.h
 include/X11/qt4/QtNetwork/qnetworkcookie.h
 include/X11/qt4/QtNetwork/qnetworkcookiejar.h
 include/X11/qt4/QtNetwork/qnetworkdiskcache.h
@ -2489,6 +2576,7 @@ include/X11/qt4/QtNetwork/qnetworkinterface.h
 include/X11/qt4/QtNetwork/qnetworkproxy.h
 include/X11/qt4/QtNetwork/qnetworkreply.h
 include/X11/qt4/QtNetwork/qnetworkrequest.h
+include/X11/qt4/QtNetwork/qnetworksession.h
 include/X11/qt4/QtNetwork/qssl.h
 include/X11/qt4/QtNetwork/qsslcertificate.h
 include/X11/qt4/QtNetwork/qsslcipher.h
@ -2501,6 +2589,7 @@ include/X11/qt4/QtNetwork/qtcpsocket.h
 include/X11/qt4/QtNetwork/qudpsocket.h
 include/X11/qt4/QtNetwork/qurlinfo.h
 include/X11/qt4/QtOpenGL/
+include/X11/qt4/QtOpenGL/QGLBuffer
 include/X11/qt4/QtOpenGL/QGLColormap
 include/X11/qt4/QtOpenGL/QGLContext
 include/X11/qt4/QtOpenGL/QGLFormat
@ -2518,6 +2607,7 @@ include/X11/qt4/QtOpenGL/QMacCompatGLuint
 include/X11/qt4/QtOpenGL/QMacGLCompatTypes
 include/X11/qt4/QtOpenGL/QtOpenGL
 include/X11/qt4/QtOpenGL/qgl.h
+include/X11/qt4/QtOpenGL/qglbuffer.h
 include/X11/qt4/QtOpenGL/qglcolormap.h
 include/X11/qt4/QtOpenGL/qglframebufferobject.h
 include/X11/qt4/QtOpenGL/qglpixelbuffer.h
@ -2655,6 +2745,7 @@ include/X11/qt4/QtTest/QTestXunitStreamer
 include/X11/qt4/QtTest/QtTest
 include/X11/qt4/QtTest/QtTestGui
 include/X11/qt4/QtTest/qbenchmark.h
+include/X11/qt4/QtTest/qbenchmarkmetric.h
 include/X11/qt4/QtTest/qsignalspy.h
 include/X11/qt4/QtTest/qtest.h
 include/X11/qt4/QtTest/qtest_global.h
@ -2772,6 +2863,8 @@ include/X11/qt4/phonon/AudioCaptureDevice
 include/X11/qt4/phonon/AudioCaptureDeviceModel
 include/X11/qt4/phonon/AudioChannelDescription
 include/X11/qt4/phonon/AudioChannelDescriptionModel
+include/X11/qt4/phonon/AudioDataOutput
+include/X11/qt4/phonon/AudioDataOutputInterface
 include/X11/qt4/phonon/AudioOutput
 include/X11/qt4/phonon/AudioOutputDevice
 include/X11/qt4/phonon/AudioOutputDeviceModel
@ -2787,6 +2880,7 @@ include/X11/qt4/phonon/EffectInterface
 include/X11/qt4/phonon/EffectParameter
 include/X11/qt4/phonon/EffectWidget
 include/X11/qt4/phonon/Global
+include/X11/qt4/phonon/GlobalConfig
 include/X11/qt4/phonon/MediaController
 include/X11/qt4/phonon/MediaNode
 include/X11/qt4/phonon/MediaObject
@ -2799,6 +2893,7 @@ include/X11/qt4/phonon/ObjectDescriptionModelData
 include/X11/qt4/phonon/Path
 include/X11/qt4/phonon/Phonon
 include/X11/qt4/phonon/PlatformPlugin
+include/X11/qt4/phonon/PulseSupport
 include/X11/qt4/phonon/SeekSlider
 include/X11/qt4/phonon/StreamInterface
 include/X11/qt4/phonon/SubtitleDescription
@ -2806,6 +2901,8 @@ include/X11/qt4/phonon/SubtitleDescriptionModel
 include/X11/qt4/phonon/VideoPlayer
 include/X11/qt4/phonon/VideoWidget
 include/X11/qt4/phonon/VideoWidgetInterface
+include/X11/qt4/phonon/VideoWidgetInterface44
+include/X11/qt4/phonon/VideoWidgetInterfaceLatest
 include/X11/qt4/phonon/VolumeFaderEffect
 include/X11/qt4/phonon/VolumeFaderInterface
 include/X11/qt4/phonon/VolumeSlider
@ -2813,6 +2910,8 @@ include/X11/qt4/phonon/abstractaudiooutput.h
 include/X11/qt4/phonon/abstractmediastream.h
 include/X11/qt4/phonon/abstractvideooutput.h
 include/X11/qt4/phonon/addoninterface.h
+include/X11/qt4/phonon/audiodataoutput.h
+include/X11/qt4/phonon/audiodataoutputinterface.h
 include/X11/qt4/phonon/audiooutput.h
 include/X11/qt4/phonon/audiooutputinterface.h
 include/X11/qt4/phonon/backendcapabilities.h
@ -2821,6 +2920,7 @@ include/X11/qt4/phonon/effect.h
 include/X11/qt4/phonon/effectinterface.h
 include/X11/qt4/phonon/effectparameter.h
 include/X11/qt4/phonon/effectwidget.h
+include/X11/qt4/phonon/globalconfig.h
 include/X11/qt4/phonon/mediacontroller.h
 include/X11/qt4/phonon/medianode.h
 include/X11/qt4/phonon/mediaobject.h
@ -2834,6 +2934,7 @@ include/X11/qt4/phonon/phonon_export.h
 include/X11/qt4/phonon/phonondefs.h
 include/X11/qt4/phonon/phononnamespace.h
 include/X11/qt4/phonon/platformplugin.h
+include/X11/qt4/phonon/pulsesupport.h
 include/X11/qt4/phonon/seekslider.h
 include/X11/qt4/phonon/streaminterface.h
 include/X11/qt4/phonon/videoplayer.h
@ -2846,7 +2947,6 @@ lib/qt4/
 lib/qt4/bin/
@bin lib/qt4/bin/assistant
 lib/qt4/bin/assistant4
-@bin lib/qt4/bin/assistant_adp
@bin lib/qt4/bin/designer
 lib/qt4/bin/findtr
@bin lib/qt4/bin/lconvert
@ -2865,6 +2965,7 @@ lib/qt4/bin/moc4
@bin lib/qt4/bin/qhelpconverter
@bin lib/qt4/bin/qhelpgenerator
@bin lib/qt4/bin/qmake
+@bin lib/qt4/bin/qmlviewer
@bin lib/qt4/bin/qt3to4
@bin lib/qt4/bin/qtconfig
@bin lib/qt4/bin/qttracereplay
@ -2874,16 +2975,28 @@ lib/qt4/bin/syncqt
@bin lib/qt4/bin/uic3
@bin lib/qt4/bin/xmlpatterns
@bin lib/qt4/bin/xmlpatternsvalidator
+lib/qt4/imports/
+lib/qt4/imports/Qt/
+lib/qt4/imports/Qt/labs/
+lib/qt4/imports/Qt/labs/folderlistmodel/
+lib/qt4/imports/Qt/labs/folderlistmodel/qmldir
+lib/qt4/imports/Qt/labs/gestures/
+lib/qt4/imports/Qt/labs/gestures/qmldir
+lib/qt4/imports/Qt/labs/particles/
+lib/qt4/imports/Qt/labs/particles/qmldir
+lib/qt4/imports/QtWebKit/
+lib/qt4/imports/QtWebKit/qmldir
 lib/qt4/include
@comment lib/qt4/libQt3Support.la
 lib/qt4/libQt3Support.prl
-lib/qt4/libQtAssistantClient.prl
 lib/qt4/libQtCLucene.la
 lib/qt4/libQtCLucene.prl
@comment lib/qt4/libQtCore.la
 lib/qt4/libQtCore.prl
 lib/qt4/libQtDBus.la
 lib/qt4/libQtDBus.prl
+lib/qt4/libQtDeclarative.la
+lib/qt4/libQtDeclarative.prl
 lib/qt4/libQtDesigner.prl
 lib/qt4/libQtDesignerComponents.prl
@comment lib/qt4/libQtGui.la
@ -2928,17 +3041,40 @@ lib/qt4/mkspecs/aix-xlc-64/qplatformdefs.h
 lib/qt4/mkspecs/aix-xlc/qmake.conf
 lib/qt4/mkspecs/aix-xlc/qplatformdefs.h
 lib/qt4/mkspecs/common/
+lib/qt4/mkspecs/common/aix/
+lib/qt4/mkspecs/common/aix/qplatformdefs.h
+lib/qt4/mkspecs/common/armcc.conf
+lib/qt4/mkspecs/common/c89/
+lib/qt4/mkspecs/common/c89/qplatformdefs.h
 lib/qt4/mkspecs/common/g++.conf
 lib/qt4/mkspecs/common/linux.conf
 lib/qt4/mkspecs/common/llvm.conf
 lib/qt4/mkspecs/common/mac-g++.conf
 lib/qt4/mkspecs/common/mac-llvm.conf
 lib/qt4/mkspecs/common/mac.conf
+lib/qt4/mkspecs/common/posix/
+lib/qt4/mkspecs/common/posix/qplatformdefs.h
 lib/qt4/mkspecs/common/qws.conf
 lib/qt4/mkspecs/common/symbian/
+lib/qt4/mkspecs/common/symbian/header-wrappers/
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknPopupFader.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknServerApp.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknUtils.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknsConstants.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknsItemID.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/AknsUtils.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h
+lib/qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h
 lib/qt4/mkspecs/common/symbian/qplatformdefs.h
 lib/qt4/mkspecs/common/symbian/stl-off/
 lib/qt4/mkspecs/common/symbian/stl-off/new
+lib/qt4/mkspecs/common/symbian/symbian-makefile.conf
+lib/qt4/mkspecs/common/symbian/symbian-mmp.conf
 lib/qt4/mkspecs/common/symbian/symbian.conf
 lib/qt4/mkspecs/common/unix.conf
 lib/qt4/mkspecs/common/wince/
@ -2952,7 +3088,6 @@ lib/qt4/mkspecs/darwin-g++/qmake.conf
 lib/qt4/mkspecs/darwin-g++/qplatformdefs.h
 lib/qt4/mkspecs/default
 lib/qt4/mkspecs/features/
-lib/qt4/mkspecs/features/assistant.prf
 lib/qt4/mkspecs/features/build_pass.prf
 lib/qt4/mkspecs/features/dbusadaptors.prf
 lib/qt4/mkspecs/features/dbusinterfaces.prf
@ -2994,6 +3129,7 @@ lib/qt4/mkspecs/features/release.prf
 lib/qt4/mkspecs/features/resources.prf
 lib/qt4/mkspecs/features/shared.prf
 lib/qt4/mkspecs/features/silent.prf
+lib/qt4/mkspecs/features/sis_targets.prf
 lib/qt4/mkspecs/features/static.prf
 lib/qt4/mkspecs/features/static_and_shared.prf
 lib/qt4/mkspecs/features/staticlib.prf
@ -3002,16 +3138,24 @@ lib/qt4/mkspecs/features/symbian/add_mmp_rules.prf
 lib/qt4/mkspecs/features/symbian/application_icon.prf
 lib/qt4/mkspecs/features/symbian/armcc_warnings.prf
 lib/qt4/mkspecs/features/symbian/data_caging_paths.prf
+lib/qt4/mkspecs/features/symbian/debug.prf
 lib/qt4/mkspecs/features/symbian/def_files.prf
 lib/qt4/mkspecs/features/symbian/def_files_disabled.prf
 lib/qt4/mkspecs/features/symbian/default_post.prf
 lib/qt4/mkspecs/features/symbian/default_pre.prf
+lib/qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf
 lib/qt4/mkspecs/features/symbian/epocallowdlldata.prf
 lib/qt4/mkspecs/features/symbian/moc.prf
 lib/qt4/mkspecs/features/symbian/platform_paths.prf
 lib/qt4/mkspecs/features/symbian/qt.prf
+lib/qt4/mkspecs/features/symbian/qt_config.prf
+lib/qt4/mkspecs/features/symbian/release.prf
+lib/qt4/mkspecs/features/symbian/run_on_phone.prf
 lib/qt4/mkspecs/features/symbian/stl.prf
 lib/qt4/mkspecs/features/symbian/stl_off.prf
+lib/qt4/mkspecs/features/symbian/symbian_building.prf
+lib/qt4/mkspecs/features/symbian/thread.prf
+lib/qt4/mkspecs/features/testcase.prf
 lib/qt4/mkspecs/features/uic.prf
 lib/qt4/mkspecs/features/uitools.prf
 lib/qt4/mkspecs/features/unix/
@ -3182,6 +3326,8 @@ lib/qt4/mkspecs/macx-xcode/qplatformdefs.h
 lib/qt4/mkspecs/macx-xlc/
 lib/qt4/mkspecs/macx-xlc/qmake.conf
 lib/qt4/mkspecs/macx-xlc/qplatformdefs.h
+lib/qt4/mkspecs/modules/
+lib/qt4/mkspecs/modules/qt_webkit_version.pri
 lib/qt4/mkspecs/netbsd-g++/
 lib/qt4/mkspecs/netbsd-g++/qmake.conf
 lib/qt4/mkspecs/netbsd-g++/qplatformdefs.h
@ -3202,6 +3348,9 @@ lib/qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/linux-arm-g++/
 lib/qt4/mkspecs/qws/linux-arm-g++/qmake.conf
 lib/qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/linux-arm-gnueabi-g++/
+lib/qt4/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf
+lib/qt4/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/linux-armv6-g++/
 lib/qt4/mkspecs/qws/linux-armv6-g++/qmake.conf
 lib/qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
@ -3283,6 +3432,7 @@ lib/qt4/mkspecs/solaris-g++-64/qmake.conf
 lib/qt4/mkspecs/solaris-g++-64/qplatformdefs.h
 lib/qt4/mkspecs/solaris-g++/qmake.conf
 lib/qt4/mkspecs/solaris-g++/qplatformdefs.h
+lib/qt4/mkspecs/symbian/
 lib/qt4/mkspecs/symbian-abld/
 lib/qt4/mkspecs/symbian-abld/qmake.conf
 lib/qt4/mkspecs/symbian-abld/qplatformdefs.h
@ -3296,6 +3446,16 @@ lib/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
 lib/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
 lib/qt4/mkspecs/symbian-sbsv2/qmake.conf
 lib/qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
+lib/qt4/mkspecs/symbian/linux-armcc/
+lib/qt4/mkspecs/symbian/linux-armcc/features/
+lib/qt4/mkspecs/symbian/linux-armcc/features/default_post.prf
+lib/qt4/mkspecs/symbian/linux-armcc/qmake.conf
+lib/qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h
+lib/qt4/mkspecs/symbian/linux-gcce/
+lib/qt4/mkspecs/symbian/linux-gcce/features/
+lib/qt4/mkspecs/symbian/linux-gcce/features/default_post.prf
+lib/qt4/mkspecs/symbian/linux-gcce/qmake.conf
+lib/qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h
 lib/qt4/mkspecs/tru64-cxx/
 lib/qt4/mkspecs/tru64-cxx/qmake.conf
 lib/qt4/mkspecs/tru64-cxx/qplatformdefs.h
@ -3319,6 +3479,9 @@ lib/qt4/mkspecs/unsupported/qnx-g++/
 lib/qt4/mkspecs/unsupported/qnx-g++/qmake.conf
 lib/qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/qws/
+lib/qt4/mkspecs/unsupported/qws/qnx-641/
+lib/qt4/mkspecs/unsupported/qws/qnx-641/qmake.conf
+lib/qt4/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/qws/qnx-generic-g++/
 lib/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
 lib/qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
@ -3340,6 +3503,9 @@ lib/qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/vxworks-simpentium-g++/
 lib/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
 lib/qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/win32-g++-cross/
+lib/qt4/mkspecs/unsupported/win32-g++-cross/qmake.conf
+lib/qt4/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
 lib/qt4/mkspecs/win32-borland/
 lib/qt4/mkspecs/win32-borland/qmake.conf
 lib/qt4/mkspecs/win32-borland/qplatformdefs.h
@ -3349,18 +3515,6 @@ lib/qt4/mkspecs/win32-g++/qplatformdefs.h
 lib/qt4/mkspecs/win32-icc/
 lib/qt4/mkspecs/win32-icc/qmake.conf
 lib/qt4/mkspecs/win32-icc/qplatformdefs.h
-lib/qt4/mkspecs/win32-msvc/
-lib/qt4/mkspecs/win32-msvc.net/
-lib/qt4/mkspecs/win32-msvc.net/qmake.conf
-lib/qt4/mkspecs/win32-msvc.net/qplatformdefs.h
-lib/qt4/mkspecs/win32-msvc/features/
-lib/qt4/mkspecs/win32-msvc/features/incremental.prf
-lib/qt4/mkspecs/win32-msvc/features/incremental_off.prf
-lib/qt4/mkspecs/win32-msvc/qmake.conf
-lib/qt4/mkspecs/win32-msvc/qplatformdefs.h
-lib/qt4/mkspecs/win32-msvc2002/
-lib/qt4/mkspecs/win32-msvc2002/qmake.conf
-lib/qt4/mkspecs/win32-msvc2002/qplatformdefs.h
 lib/qt4/mkspecs/win32-msvc2003/
 lib/qt4/mkspecs/win32-msvc2003/qmake.conf
 lib/qt4/mkspecs/win32-msvc2003/qplatformdefs.h
@ -3370,6 +3524,9 @@ lib/qt4/mkspecs/win32-msvc2005/qplatformdefs.h
 lib/qt4/mkspecs/win32-msvc2008/
 lib/qt4/mkspecs/win32-msvc2008/qmake.conf
 lib/qt4/mkspecs/win32-msvc2008/qplatformdefs.h
+lib/qt4/mkspecs/win32-msvc2010/
+lib/qt4/mkspecs/win32-msvc2010/qmake.conf
+lib/qt4/mkspecs/win32-msvc2010/qplatformdefs.h
 lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/
 lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
 lib/qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
@ -3458,6 +3615,7 @@ lib/qt4/phrasebooks/dutch.qph
 lib/qt4/phrasebooks/finnish.qph
 lib/qt4/phrasebooks/french.qph
 lib/qt4/phrasebooks/german.qph
+lib/qt4/phrasebooks/hungarian.qph
 lib/qt4/phrasebooks/italian.qph
 lib/qt4/phrasebooks/japanese.qph
 lib/qt4/phrasebooks/norwegian.qph
@ -3467,10 +3625,10 @@ 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/QtCLucene.pc
 lib/qt4/pkgconfig/QtCore.pc
 lib/qt4/pkgconfig/QtDBus.pc
+lib/qt4/pkgconfig/QtDeclarative.pc
 lib/qt4/pkgconfig/QtDesigner.pc
 lib/qt4/pkgconfig/QtDesignerComponents.pc
 lib/qt4/pkgconfig/QtGui.pc
@ -3489,6 +3647,7 @@ lib/qt4/pkgconfig/QtXmlPatterns.pc
 lib/qt4/pkgconfig/phonon.pc
 lib/qt4/plugins/
 lib/qt4/plugins/accessible/
+lib/qt4/plugins/bearer/
 lib/qt4/plugins/designer/
 lib/qt4/plugins/graphicssystems/
 lib/qt4/plugins/iconengines/
@ -3499,16 +3658,11 @@ lib/qt4/plugins/script/
 lib/qt4/plugins/sqldrivers/
 lib/qt4/q3porting.xml
 lib/qt4/translations/
-lib/qt4/translations/assistant_adp_de.qm
-lib/qt4/translations/assistant_adp_ja.qm
-lib/qt4/translations/assistant_adp_pl.qm
-lib/qt4/translations/assistant_adp_ru.qm
-lib/qt4/translations/assistant_adp_zh_CN.qm
-lib/qt4/translations/assistant_adp_zh_TW.qm
 lib/qt4/translations/assistant_cs.qm
 lib/qt4/translations/assistant_da.qm
 lib/qt4/translations/assistant_de.qm
 lib/qt4/translations/assistant_fr.qm
+lib/qt4/translations/assistant_hu.qm
 lib/qt4/translations/assistant_ja.qm
 lib/qt4/translations/assistant_pl.qm
 lib/qt4/translations/assistant_ru.qm
@ -3517,6 +3671,7 @@ lib/qt4/translations/assistant_zh_TW.qm
 lib/qt4/translations/designer_cs.qm
 lib/qt4/translations/designer_de.qm
 lib/qt4/translations/designer_fr.qm
+lib/qt4/translations/designer_hu.qm
 lib/qt4/translations/designer_ja.qm
 lib/qt4/translations/designer_pl.qm
 lib/qt4/translations/designer_ru.qm
@ -3526,6 +3681,7 @@ lib/qt4/translations/designer_zh_TW.qm
 lib/qt4/translations/linguist_cs.qm
 lib/qt4/translations/linguist_de.qm
 lib/qt4/translations/linguist_fr.qm
+lib/qt4/translations/linguist_hu.qm
 lib/qt4/translations/linguist_ja.qm
 lib/qt4/translations/linguist_pl.qm
 lib/qt4/translations/linguist_ru.qm
@ -3542,12 +3698,14 @@ lib/qt4/translations/qt_help_cs.qm
 lib/qt4/translations/qt_help_da.qm
 lib/qt4/translations/qt_help_de.qm
 lib/qt4/translations/qt_help_fr.qm
+lib/qt4/translations/qt_help_hu.qm
 lib/qt4/translations/qt_help_ja.qm
 lib/qt4/translations/qt_help_pl.qm
 lib/qt4/translations/qt_help_ru.qm
 lib/qt4/translations/qt_help_zh_CN.qm
 lib/qt4/translations/qt_help_zh_TW.qm
-lib/qt4/translations/qt_ja_JP.qm
+lib/qt4/translations/qt_hu.qm
+lib/qt4/translations/qt_ja.qm
 lib/qt4/translations/qt_pl.qm
 lib/qt4/translations/qt_pt.qm
 lib/qt4/translations/qt_ru.qm
@ -3557,10 +3715,12 @@ lib/qt4/translations/qt_sv.qm
 lib/qt4/translations/qt_uk.qm
 lib/qt4/translations/qt_zh_CN.qm
 lib/qt4/translations/qt_zh_TW.qm
+lib/qt4/translations/qtconfig_hu.qm
 lib/qt4/translations/qtconfig_pl.qm
 lib/qt4/translations/qtconfig_ru.qm
 lib/qt4/translations/qtconfig_zh_CN.qm
 lib/qt4/translations/qtconfig_zh_TW.qm
+lib/qt4/translations/qvfb_hu.qm
 lib/qt4/translations/qvfb_pl.qm
 lib/qt4/translations/qvfb_ru.qm
 lib/qt4/translations/qvfb_zh_CN.qm