update to 4.8.2

- since we no longer have GCC3_ARCHES, simplify, no way it's gonna compile on a GCC2_ARCH anyways (size matters) - so, we have only SHARED_ONLY arches, remove those frags as well. - fold back qt4-sqlite since sqlite is part of core now.
2012-06-14 09:38:35 +00:00 · 2012-06-14 09:38:35 +00:00 · b60dcae74a
commit b60dcae74a
parent cf153cacfa
46 changed files with 2762 additions and 1430 deletions
--- a/x11/qt4/Makefile
+++ b/x11/qt4/Makefile
@ -1,4 +1,7 @@
-# $OpenBSD: Makefile,v 1.98 2012/05/20 10:39:00 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.99 2012/06/14 09:38:35 espie Exp $
+
+ONLY_FOR_ARCHS =	${GCC4_ARCHS}
+SHARED_ONLY =		Yes

 USE_GMAKE =		Yes
 COMMENT-debug =		C++ GUI toolkit, debug
@ -8,31 +11,19 @@ COMMENT-html =		off-line html documentation for qt4
 COMMENT-postgresql =	PostgresSQL plugin for qt4
 COMMENT-mysql =		MySQL plugin for qt4
 COMMENT-sqlite2 =	sqlite2 plugin for qt4
-COMMENT-sqlite =	sqlite plugin for qt4
 COMMENT-tds =		tds plugin for qt4

-PKGNAME =		qt4-${VERSION}
+PKGNAME =		qt4-${PKGVERSION}
 PKGNAME-mysql =		qt4-mysql-${PKGVERSION}
 PKGNAME-postgresql =	qt4-postgresql-${PKGVERSION}
 PKGNAME-examples =	qt4-examples-${PKGVERSION}
 PKGNAME-sqlite2 =	qt4-sqlite2-${PKGVERSION}
-PKGNAME-sqlite =	qt4-sqlite-${PKGVERSION}
 PKGNAME-tds =		qt4-tds-${PKGVERSION}
-PKGNAME-main =		qt4-${VERSION}
+PKGNAME-main =		qt4-${PKGVERSION}
 PKGNAME-debug =		qt4-debug-${PKGVERSION}
 FULLPKGNAME-html =	qt4-html-${PKGVERSION}
 FULLPKGPATH-html =	${BASE_PKGPATH},-html

-REVISION-mysql =	0
-REVISION-postgresql =	0
-REVISION-examples =	0
-REVISION-sqlite2 =	0
-REVISION-sqlite =	1
-REVISION-tds =		0
-REVISION-main =		5
-REVISION-debug =	0
-REVISION-html =		0
-

 SHARED_LIBS =	Qt3Support 8.0 \
 		QtCore 9.0 \
@ -57,19 +48,12 @@ SHARED_LIBS =	Qt3Support 8.0 \
 		QtDeclarative 0.0 


-VERSION =	4.7.4
-PKGVERSION =	4.7.4
+VERSION =	4.8.2
+PKGVERSION =	4.8.2
 DISTNAME =	qt-everywhere-opensource-src-${VERSION}

 CATEGORIES =	x11
-MASTER_SITES =	http://get.qt.nokia.com/qt/source/ \
-		ftp://ftp.qt.nokia.com/qt/source/ \
-		ftp://ftp.troll.no/qt/source/ \
-		ftp://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/ \
-		ftp://ftp.ntua.gr/pub/X11/Qt/qt/source/ \
-		ftp://ftp.tu-chemnitz.de/pub/Qt/qt/source/ \
-		http://ftp.silug.org/pub/qt/source/
-
+MASTER_SITES =  http://releases.qt-project.org/qt4/source/

 HOMEPAGE =	http://qt.nokia.com/

@ -94,13 +78,14 @@ MAKE_ENV =	QTDIR="${WRKDIST}" EXTRA_SAMPLES="${EXTRA_SAMPLES}" \
 PORTHOME =	${WRKDIST}

 CONFIGURE_STYLE =	simple
-SEPARATE_BUILD = 	Yes
-CONFIGURE_ARGS =	-qt-gif -system-libpng -system-libjpeg -system-zlib \
+SEPARATE_BUILD = 	simple
+CONFIGURE_ARGS =	-system-libpng -system-libjpeg -system-zlib \
 			-sm -system-sqlite \
 			-v -stl -xrender -fast \
 			-no-sql-odbc \
 			-xinput \
 			-xinerama \
+			-iconv \
 			-cups \
 			-confirm-license \
 			-opensource \
@ -127,6 +112,7 @@ CONFIGURE_ARGS += 	-I${LOCALBASE}/include/mysql -L${LOCALBASE}/lib/mysql \
 CONFIGURE_ARGS += 	-I${LOCALBASE}/include/postgresql \
 	    		-I${LOCALBASE}/include/postgresql/server \
 			-plugin-sql-psql
+CONFIGURE_ARGS +=	-platform openbsd-g++4

 # XXX make sure those libraries gets written to libQtGui.la
 QMAKE_LIBS_GUI =	freetype SM ICE Xi Xrender Xinerama fontconfig Xext X11
@ -143,9 +129,9 @@ BUILD_DEPENDS +=	x11/dbus
 BUILD_DEPENDS +=	databases/postgresql,-server

 MULTI_PACKAGES =	-main -examples \
-			-html -mysql -postgresql -sqlite2 -sqlite -tds
+			-html -mysql -postgresql -sqlite2 -tds

-.if ${FLAVOR:L:Mdebug}
+.if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS +=	-debug
 MULTI_PACKAGES +=	-debug
 .else
@ -198,9 +184,9 @@ LIB_DEPENDS =
 WANTLIB =
 RUN_DEPENDS =

-commonWANTLIB =		c GLU pthread GL m
+commonWANTLIB =		c pthread GL m stdc++

-sqlWANTLIB =		m lib/qt4/QtCore>=4 QtSql
+sqlWANTLIB =		m lib/qt4/QtCore>=4 QtSql stdc++

 RUN_DEPENDS-main=	${MODGETTEXT_RUN_DEPENDS}
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
@ -215,7 +201,8 @@ WANTLIB-main =		${commonWANTLIB} jpeg mng \
 			gobject-2.0 gmodule-2.0 gstinterfaces-0.10 \
 			${MODGETTEXT_WANTLIB} glib-2.0 gthread-2.0 \
 			gstaudio-0.10 ICE SM X11>=10 Xext Xi Xinerama \
-			Xrender expat fontconfig freetype png>=2 z
+			Xrender expat fontconfig freetype png>=2 z \
+			sqlite3


 LIB_DEPENDS-mysql =	${BUILD_PKGPATH} \
@ -234,10 +221,6 @@ LIB_DEPENDS-sqlite2 =	${BUILD_PKGPATH} \
 WANTLIB-sqlite2 =	${sqlWANTLIB} sqlite


-LIB_DEPENDS-sqlite =	${BUILD_PKGPATH}
-WANTLIB-sqlite =	${sqlWANTLIB} sqlite3
-
-
 LIB_DEPENDS-tds =	${BUILD_PKGPATH} \
 			databases/freetds
 WANTLIB-tds =		${sqlWANTLIB} sybdb
@ -246,30 +229,20 @@ LIB_DEPENDS-examples =	${BUILD_PKGPATH}
 WANTLIB-examples =	${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/QtSvg lib/qt4/QtTest \
 			lib/qt4/QtDBus \
 			lib/qt4/QtScript lib/qt4/QtScriptTools \
 			lib/qt4/QtHelp lib/qt4/phonon \
-			lib/qt4/QtMultimedia lib/qt4/QtDeclarative
+			lib/qt4/QtMultimedia lib/qt4/QtDeclarative \
+			lib/qt4/QtWebKit lib/qt4/QtXmlPatterns \
+			ICE SM X11 Xext  Xi Xinerama Xrender fontconfig \
+			freetype

 LIB_DEPENDS-html =
 WANTLIB-html =
 RUN_DEPENDS-html =
 PKG_ARCH-html =	*

-.if ${COMPILER_VERSION:L:Mgcc4*}
-CONFIGURE_ARGS +=	-platform openbsd-g++4
-PKG_ARGS += 		-DGCC4=1
-commonWANTLIB += 	stdc++
-sqlWANTLIB += 		stdc++
-WANTLIB-examples +=	lib/qt4/QtWebKit lib/qt4/QtXmlPatterns
-WANTLIB-main += 	sqlite3
-.else
-PKG_ARGS += 		-DGCC4=0
-.endif
-
-commonWANTLIB += 	stdc++
-
 QT_BASEDIR =	${PREFIX}/lib/qt4
 QT_INCDIR =	${PREFIX}/include/X11/qt4
 QT_EXAMPLES =	${QT_BASEDIR}/examples
--- a/x11/qt4/distinfo
+++ b/x11/qt4/distinfo
@ -1,5 +1,5 @@
-MD5 (qt-everywhere-opensource-src-4.7.4.tar.gz) = mDHPHfqNBomgbCxUxcZarw==
-RMD160 (qt-everywhere-opensource-src-4.7.4.tar.gz) = PkewlmOomXOxyGKFBsmV38KlOHw=
-SHA1 (qt-everywhere-opensource-src-4.7.4.tar.gz) = r5AWqpJKV397Bv/SjJdztW10yTk=
-SHA256 (qt-everywhere-opensource-src-4.7.4.tar.gz) = lxlevOikb5kp+5cdmuWDJtARxNVEJTiebpNlFPVAIh4=
-SIZE (qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303
+MD5 (qt-everywhere-opensource-src-4.8.2.tar.gz) = PBFG3fViR+FngvlpEKhCOw==
+RMD160 (qt-everywhere-opensource-src-4.8.2.tar.gz) = ahUHeu4ehAdjgHhxJ7gMe7l+voY=
+SHA1 (qt-everywhere-opensource-src-4.8.2.tar.gz) = 4eLt7x1j7Wd9ZTTTKADC4fetDnM=
+SHA256 (qt-everywhere-opensource-src-4.8.2.tar.gz) = khsqLQYJNM7aZa5GFe3sR0zqE9PIk+ffGa0SYufcI3k=
+SIZE (qt-everywhere-opensource-src-4.8.2.tar.gz) = 239108331
--- a/x11/qt4/patches/patch-config_tests_unix_gnu-libiconv_gnu-libiconv_cpp
+++ b/x11/qt4/patches/patch-config_tests_unix_gnu-libiconv_gnu-libiconv_cpp
@ -0,0 +1,12 @@
+$OpenBSD: patch-config_tests_unix_gnu-libiconv_gnu-libiconv_cpp,v 1.3 2012/06/14 09:38:35 espie Exp $
+--- config.tests/unix/gnu-libiconv/gnu-libiconv.cpp.orig	Sun Jun 10 13:36:58 2012
+++ config.tests/unix/gnu-libiconv/gnu-libiconv.cpp	Sun Jun 10 13:38:54 2012
+@@ -48,7 +48,7 @@ int main(int, char **)
+ {
+     iconv_t x = iconv_open("", "");
+ 
+-    const char *inp;
+    char *inp;
+     char *outp;
+     size_t inbytes, outbytes;
+     iconv(x, &inp, &inbytes, &outp, &outbytes);
--- a/x11/qt4/patches/patch-configure
+++ b/x11/qt4/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.23 2011/12/26 15:51:55 kili Exp $
--- configure.orig	Mon Sep 12 08:49:28 2011
-+++ configure	Mon Dec 26 16:47:31 2011
-@@ -776,7 +776,7 @@ CFG_SILENT=no
+$OpenBSD: patch-configure,v 1.24 2012/06/14 09:38:35 espie Exp $
+--- configure.orig	Thu Apr 26 21:46:24 2012
+++ configure	Sun Jun 10 13:25:08 2012
+@@ -890,7 +890,7 @@ CFG_SILENT=no
 CFG_GRAPHICS_SYSTEM=default
 CFG_RUNTIME_SYSTEM=
 CFG_ALSA=auto
@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.23 2011/12/26 15:51:55 kili Exp $
 CFG_COREWLAN=auto
 CFG_ICD=auto
 CFG_NOPROCESS=no
-@@ -2138,7 +2138,7 @@ while [ "$#" -gt 0 ]; do
+@@ -2347,7 +2347,7 @@ while [ "$#" -gt 0 ]; do
     v|verbose)
         if [ "$VAL" = "yes" ]; then
             if [ "$OPT_VERBOSE" = "$VAL" ]; then            # takes two verboses to turn on qmake debugs
@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.23 2011/12/26 15:51:55 kili Exp $
             else
                 OPT_VERBOSE=yes
             fi
-@@ -4618,7 +4618,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4897,7 +4897,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
         EXTRA_OBJS=
         EXTRA_SRCS=
         EXTRA_CFLAGS="\$(QMAKE_CFLAGS)"
@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.23 2011/12/26 15:51:55 kili Exp $
         EXTRA_LFLAGS="\$(QMAKE_LFLAGS)"
 
         if [ "$PLATFORM" = "irix-cc" ] || [ "$PLATFORM" = "irix-cc-64" ]; then
-@@ -4722,7 +4722,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
+@@ -4997,7 +4997,7 @@ if true; then ###[ '!' -f "$outpath/bin/qmake" ];
     done
 
     QMAKE_BUILD_ERROR=no
--- a/x11/qt4/patches/patch-mkspecs_features_qt_prf
+++ b/x11/qt4/patches/patch-mkspecs_features_qt_prf
@ -1,7 +1,7 @@
-$OpenBSD: patch-mkspecs_features_qt_prf,v 1.1 2011/04/03 13:35:31 dcoppa Exp $
--- mkspecs/features/qt.prf.orig	Wed Mar 30 09:13:40 2011
-+++ mkspecs/features/qt.prf	Wed Mar 30 09:14:55 2011
-@@ -212,10 +212,10 @@ mac {
+$OpenBSD: patch-mkspecs_features_qt_prf,v 1.2 2012/06/14 09:38:35 espie Exp $
+--- mkspecs/features/qt.prf.orig	Thu Dec  8 06:06:02 2011
+++ mkspecs/features/qt.prf	Thu Dec 15 20:09:13 2011
+@@ -218,10 +218,10 @@ mac {
 mmx:DEFINES += QT_HAVE_MMX
 3dnow:DEFINES += QT_HAVE_3DNOW
 sse:DEFINES += QT_HAVE_SSE QT_HAVE_MMXEXT
--- a/x11/qt4/patches/patch-mkspecs_openbsd-g++4_qmake_conf
+++ b/x11/qt4/patches/patch-mkspecs_openbsd-g++4_qmake_conf
@ -1,8 +1,8 @@
-$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
+$OpenBSD: patch-mkspecs_openbsd-g++4_qmake_conf,v 1.3 2012/06/14 09:38:35 espie Exp $
+--- mkspecs/openbsd-g++4/qmake.conf.orig	Thu Dec 15 20:09:13 2011
+++ mkspecs/openbsd-g++4/qmake.conf	Thu Dec 15 20:09:13 2011
@@ -8,16 +8,17 @@ TEMPLATE		= app
- CONFIG			+= qt warn_on release link_prl
+ CONFIG			+= qt warn_on release link_prl gdb_dwarf_index
 QT			+= core gui
 
 +QMAKE_OPENBSD_SHLIBS    = 1
--- a/x11/qt4/patches/patch-mkspecs_openbsd-g++_qmake_conf
+++ b/x11/qt4/patches/patch-mkspecs_openbsd-g++_qmake_conf
@ -1,8 +1,8 @@
-$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
+$OpenBSD: patch-mkspecs_openbsd-g++_qmake_conf,v 1.10 2012/06/14 09:38:35 espie Exp $
+--- mkspecs/openbsd-g++/qmake.conf.orig	Thu Dec  8 06:06:02 2011
+++ mkspecs/openbsd-g++/qmake.conf	Thu Dec 15 20:09:13 2011
@@ -8,16 +8,17 @@ TEMPLATE		= app
- CONFIG			+= qt warn_on release link_prl
+ CONFIG			+= qt warn_on release link_prl gdb_dwarf_index
 QT			+= core gui
 
 +QMAKE_OPENBSD_SHLIBS    = 1
--- a/x11/qt4/patches/patch-qmake_generators_unix_unixmake2_cpp
+++ b/x11/qt4/patches/patch-qmake_generators_unix_unixmake2_cpp
@ -1,6 +1,6 @@
-$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 espie Exp $
--- qmake/generators/unix/unixmake2.cpp.orig	Mon Sep 12 10:49:28 2011
-+++ qmake/generators/unix/unixmake2.cpp	Sun Oct 30 01:32:03 2011
+$OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.16 2012/06/14 09:38:35 espie Exp $
+--- qmake/generators/unix/unixmake2.cpp.orig	Thu Dec  8 06:06:02 2011
+++ qmake/generators/unix/unixmake2.cpp	Thu Dec 15 20:09:13 2011
@@ -80,6 +80,9 @@ UnixMakefileGenerator::writeMakefile(QTextStream &t)
 {
 
@ -11,7 +11,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 e
     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)
+@@ -247,10 +250,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")) {
@ -24,7 +24,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 e
         } else {
             t << "TARGETD       = " << escapeFilePath(var("TARGET_x")) << endl;
             t << "TARGET0       = " << escapeFilePath(var("TARGET_")) << endl;
-@@ -567,31 +568,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
+@@ -572,31 +573,22 @@ UnixMakefileGenerator::writeMakeParts(QTextStream &t)
             t << endl << endl;
         } else if(project->isEmpty("QMAKE_HPUX_SHLIB")) {
             t << "\n\t"
@ -59,7 +59,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 e
             if(!project->isEmpty("QMAKE_POST_LINK"))
                 t << "\n\t" << var("QMAKE_POST_LINK");
             t << endl << endl;
-@@ -998,6 +990,13 @@ void UnixMakefileGenerator::init2()
+@@ -1019,6 +1011,13 @@ void UnixMakefileGenerator::init2()
     project->values("VER_MAJ").append(l[0]);
     project->values("VER_MIN").append(l[1]);
     project->values("VER_PAT").append(l[2]);
@ -73,7 +73,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 e
     if(project->isEmpty("QMAKE_FRAMEWORK_VERSION"))
         project->values("QMAKE_FRAMEWORK_VERSION").append(project->values("VER_MAJ").first());
 
-@@ -1135,7 +1134,7 @@ void UnixMakefileGenerator::init2()
+@@ -1159,7 +1158,7 @@ void UnixMakefileGenerator::init2()
                                                             project->first("VER_MIN") +  "." +
                                                             project->first("VER_PAT"));
             }
@ -82,7 +82,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 e
         }
         if(project->isEmpty("QMAKE_LN_SHLIB"))
             project->values("QMAKE_LN_SHLIB").append("ln -s");
-@@ -1280,18 +1279,31 @@ UnixMakefileGenerator::writeLibtoolFile()
+@@ -1304,18 +1303,31 @@ UnixMakefileGenerator::writeLibtoolFile()
       << QT_VERSION_STR << ") on: " << QDateTime::currentDateTime().toString();
 	t << "\n";
 
@ -120,10 +120,7 @@ $OpenBSD: patch-qmake_generators_unix_unixmake2_cpp,v 1.15 2011/11/06 12:44:04 e
     }
     t << "'\n\n";
 
-@@ -1303,10 +1315,10 @@ UnixMakefileGenerator::writeLibtoolFile()
-     if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS"))
-         libs = project->values("QMAKE_INTERNAL_PRL_LIBS");
-     else
+@@ -1330,7 +1342,7 @@ UnixMakefileGenerator::writeLibtoolFile()
         libs << "QMAKE_LIBS"; //obvious one
     t << "dependency_libs='";
     for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it)
--- 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.15 2011/04/03 13:35:31 dcoppa Exp $
--- qmake/generators/unix/unixmake.cpp.orig	Tue Feb 22 13:02:48 2011
-+++ qmake/generators/unix/unixmake.cpp	Tue Mar 29 14:02:17 2011
-@@ -724,7 +724,7 @@ UnixMakefileGenerator::defaultInstall(const QString &t
+$OpenBSD: patch-qmake_generators_unix_unixmake_cpp,v 1.16 2012/06/14 09:38:35 espie Exp $
+--- qmake/generators/unix/unixmake.cpp.orig	Thu Dec  8 06:06:02 2011
+++ qmake/generators/unix/unixmake.cpp	Thu Dec 15 20:09:13 2011
+@@ -757,7 +757,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_wtf_Platform_h
+++ b/x11/qt4/patches/patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h
@ -1,7 +1,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 @@
+$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform_h,v 1.5 2012/06/14 09:38:35 espie Exp $
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig	Thu Apr 26 21:46:22 2012
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h	Sun Jun 10 13:25:08 2012
+@@ -884,7 +884,7 @@
 #endif
 
 #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64)
--- 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,9 +1,9 @@
-$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); }
+$OpenBSD: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h,v 1.3 2012/06/14 09:38:35 espie Exp $
+--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h.orig	Thu Apr 26 21:46:22 2012
+++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h	Sun Jun 10 13:25:08 2012
+@@ -247,7 +247,7 @@ inline int atomicDecrement(int volatile* addend) { ret
+ inline int atomicIncrement(int volatile* addend) { return (int) atomic_add_value((unsigned volatile*)addend, 1); }
+ inline int atomicDecrement(int volatile* addend) { return (int) atomic_sub_value((unsigned volatile*)addend, 1); }
 
 -#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
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_JavaScriptCore_pro
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_JavaScriptCore_JavaScriptCore_pro
@ -1,15 +0,0 @@
-$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,12 +0,0 @@
-$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
- 
-#if HAVE(PTHREAD_NP_H)
-+#if HAVE(PTHREAD_NP_H) || PLATFORM(OPENBSD)
- #include <pthread_np.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 +0,0 @@
-$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	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);
- #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));
- #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
@ -1,12 +0,0 @@
-$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_Source_JavaScriptCore_heap_MachineStackMarker_cpp
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker_cpp
@ -0,0 +1,29 @@
+$OpenBSD: patch-src_3rdparty_webkit_Source_JavaScriptCore_heap_MachineStackMarker_cpp,v 1.1 2012/06/14 09:38:35 espie Exp $
+--- src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp.orig	Thu Apr 26 21:46:12 2012
+++ src/3rdparty/webkit/Source/JavaScriptCore/heap/MachineStackMarker.cpp	Sun Jun 10 14:47:45 2012
+@@ -380,8 +380,10 @@ static size_t getPlatformThreadRegisters(const Platfor
+ #elif USE(PTHREADS)
+     pthread_attr_init(&regs);
+ #if HAVE(PTHREAD_NP_H) || OS(NETBSD)
+#  ifndef __OpenBSD__
+     // e.g. on FreeBSD 5.4, neundorf@kde.org
+     pthread_attr_get_np(platformThread, &regs);
+#  endif
+ #else
+     // FIXME: this function is non-portable; other POSIX systems may have different np alternatives
+     pthread_getattr_np(platformThread, &regs);
+@@ -432,7 +434,14 @@ static inline void* otherThreadStackPointer(const Plat
+ #elif USE(PTHREADS)
+     void* stackBase = 0;
+     size_t stackSize = 0;
+# if defined(__OpenBSD__)
+    stack_t ss;
+    int rc = pthread_stackseg_np(pthread_self(), &ss);
+    stackBase = (void*)((size_t) ss.ss_sp - ss.ss_size);
+    stackSize = ss.ss_size;
+#else
+     int rc = pthread_attr_getstack(&regs, &stackBase, &stackSize);
+#endif
+     (void)rc; // FIXME: Deal with error code somehow? Seems fatal.
+     ASSERT(stackBase);
+     return static_cast<char*>(stackBase) + stackSize;
--- a/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro
+++ b/x11/qt4/patches/patch-src_3rdparty_webkit_WebCore_WebCore_pro
@ -1,15 +0,0 @@
-$OpenBSD: patch-src_3rdparty_webkit_WebCore_WebCore_pro,v 1.4 2011/09/07 09:54:07 espie Exp $
--- src/3rdparty/webkit/WebCore/WebCore.pro.orig	Tue Aug 23 14:02:27 2011
-+++ src/3rdparty/webkit/WebCore/WebCore.pro	Mon Sep  5 11:19:03 2011
-@@ -66,9 +66,9 @@ CONFIG(standalone_package) {
-     isEmpty(JSC_GENERATED_SOURCES_DIR):JSC_GENERATED_SOURCES_DIR = ../JavaScriptCore/generated
- 
-     !CONFIG(release, debug|release) {
-        OBJECTS_DIR = obj/debug
-+        OBJECTS_DIR = .obj/debug
-     } else { # Release
-        OBJECTS_DIR = obj/release
-+        OBJECTS_DIR = .obj/release
-     }
- 
- }
--- a/x11/qt4/patches/patch-src_corelib_codecs_qiconvcodec_cpp
+++ b/x11/qt4/patches/patch-src_corelib_codecs_qiconvcodec_cpp
@ -0,0 +1,40 @@
+$OpenBSD: patch-src_corelib_codecs_qiconvcodec_cpp,v 1.3 2012/06/14 09:38:35 espie Exp $
+--- src/corelib/codecs/qiconvcodec.cpp.orig	Sun Jun 10 13:50:36 2012
+++ src/corelib/codecs/qiconvcodec.cpp	Sun Jun 10 13:54:03 2012
+@@ -219,12 +219,7 @@ QString QIconvCodec::convertToUnicode(const char* char
+     IconvState *state = *pstate;
+     size_t inBytesLeft = len;
+     // best case assumption, each byte is converted into one UTF-16 character, plus 2 bytes for the BOM
+-#ifdef GNU_LIBICONV
+-    // GNU doesn't disagree with POSIX :/
+-    const char *inBytes = chars;
+-#else
+     char *inBytes = const_cast<char *>(chars);
+-#endif
+ 
+     QByteArray in;
+     if (remainingCount) {
+@@ -318,11 +313,7 @@ static bool setByteOrder(iconv_t cd)
+     size_t outBytesLeft = sizeof buf;
+     size_t inBytesLeft = sizeof bom;
+ 
+-#if defined(GNU_LIBICONV)
+-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
+-#else
+     char **inBytesPtr = &inBytes;
+-#endif
+ 
+     if (iconv(cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
+         return false;
+@@ -338,11 +329,7 @@ QByteArray QIconvCodec::convertFromUnicode(const QChar
+     char *outBytes;
+     size_t inBytesLeft;
+ 
+-#if defined(GNU_LIBICONV)
+-    const char **inBytesPtr = const_cast<const char **>(&inBytes);
+-#else
+     char **inBytesPtr = &inBytes;
+-#endif
+ 
+     IconvState *temporaryState = 0;
+     QThreadStorage<QIconvCodec::IconvState *> *ts = fromUnicodeState();
--- 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.14 2011/09/07 09:54:07 espie Exp $
--- src/corelib/global/qglobal.h.orig	Tue Aug 23 14:02:27 2011
-+++ src/corelib/global/qglobal.h	Mon Sep  5 11:19:03 2011
-@@ -2243,7 +2243,7 @@ typedef uint Flags;
+$OpenBSD: patch-src_corelib_global_qglobal_h,v 1.15 2012/06/14 09:38:35 espie Exp $
+--- src/corelib/global/qglobal.h.orig	Thu Apr 26 21:46:08 2012
+++ src/corelib/global/qglobal.h	Sun Jun 10 13:25:08 2012
+@@ -2336,7 +2336,7 @@ typedef uint Flags;
 
 #endif /* Q_NO_TYPESAFE_FLAGS */
 
--- a/x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp
+++ b/x11/qt4/patches/patch-src_corelib_io_qfsfileengine_unix_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.15 2010/06/21 16:40:52 espie Exp $
--- src/corelib/io/qfsfileengine_unix.cpp.orig	Wed Jun  2 04:03:17 2010
-+++ src/corelib/io/qfsfileengine_unix.cpp	Mon Jun 21 11:32:32 2010
-@@ -357,7 +357,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi
+$OpenBSD: patch-src_corelib_io_qfsfileengine_unix_cpp,v 1.16 2012/06/14 09:38:35 espie Exp $
+--- src/corelib/io/qfsfileengine_unix.cpp.orig	Thu Apr 26 21:46:08 2012
+++ src/corelib/io/qfsfileengine_unix.cpp	Sun Jun 10 13:25:08 2012
+@@ -489,7 +489,7 @@ qint64 QFSFileEnginePrivate::nativeRead(char *data, qi
                     int readByte = 0;
                     do {
                         readByte = fgetc(fh);
--- 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.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
+$OpenBSD: patch-src_corelib_kernel_qmetaobject_cpp,v 1.4 2012/06/14 09:38:35 espie Exp $
+--- src/corelib/kernel/qmetaobject.cpp.orig	Thu Dec  8 06:06:03 2011
+++ src/corelib/kernel/qmetaobject.cpp	Thu Dec 15 20:11:04 2011
+@@ -1003,7 +1003,8 @@ QByteArray QMetaObject::normalizedType(const char *typ
     if (!type || !*type)
         return result;
 
--- a/x11/qt4/patches/patch-src_corelib_thread_qthread_unix_cpp
+++ b/x11/qt4/patches/patch-src_corelib_thread_qthread_unix_cpp
@ -1,12 +0,0 @@
-$OpenBSD: patch-src_corelib_thread_qthread_unix_cpp,v 1.1 2012/05/20 10:39:00 ajacoutot Exp $
--- src/corelib/thread/qthread_unix.cpp.orig	Wed May 16 14:41:19 2012
-+++ src/corelib/thread/qthread_unix.cpp	Wed May 16 14:42:34 2012
-@@ -657,7 +657,7 @@ void QThread::start(Priority priority)
-     if (code == EPERM) {
-         // caller does not have permission to set the scheduling
-         // parameters/policy
-#ifndef Q_OS_SYMBIAN
-+#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING) && (_POSIX_THREAD_PRIORITY_SCHEDULING-0 > 0)
-         pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED);
- #endif
-         code =
--- a/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp
+++ b/x11/qt4/patches/patch-src_dbus_qdbusintegrator_cpp
@ -1,11 +1,11 @@
-$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.1 2011/04/03 13:35:31 dcoppa Exp $
+$OpenBSD: patch-src_dbus_qdbusintegrator_cpp,v 1.2 2012/06/14 09:38:35 espie Exp $

 Fixes an invalid conversion error on sparc64.
 http://bugreports.qt.nokia.com/browse/QTBUG-17962

--- src/dbus/qdbusintegrator.cpp.orig	Wed Mar 30 11:48:06 2011
-+++ src/dbus/qdbusintegrator.cpp	Wed Mar 30 11:48:42 2011
-@@ -71,7 +71,7 @@ QT_BEGIN_NAMESPACE
+--- src/dbus/qdbusintegrator.cpp.orig	Thu Dec  8 06:06:03 2011
+++ src/dbus/qdbusintegrator.cpp	Thu Dec 15 20:11:04 2011
+@@ -72,7 +72,7 @@ QT_BEGIN_NAMESPACE
 static bool isDebugging;
 #define qDBusDebug              if (!::isDebugging); else qDebug
 
--- 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.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
+$OpenBSD: patch-src_gui_itemviews_qlistview_cpp,v 1.3 2012/06/14 09:38:35 espie Exp $
+--- src/gui/itemviews/qlistview.cpp.orig	Thu Dec  8 06:06:02 2011
+++ src/gui/itemviews/qlistview.cpp	Thu Dec 15 20:11:04 2011
+@@ -2907,7 +2907,8 @@ void QIconModeViewBase::doDynamicLayout(const QListVie
     if (moved.count() != items.count())
         moved.resize(items.count());
 
--- 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.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
+$OpenBSD: patch-src_gui_styles_qgtkstyle_p_cpp,v 1.3 2012/06/14 09:38:36 espie Exp $
+--- src/gui/styles/qgtkstyle_p.cpp.orig	Thu Dec  8 06:06:02 2011
+++ src/gui/styles/qgtkstyle_p.cpp	Thu Dec 15 20:11:04 2011
+@@ -311,8 +311,7 @@ GtkStyle* QGtkStylePrivate::gtkStyle(const QHashableLa
  */
 void QGtkStylePrivate::resolveGtk() const
 {
--- a/x11/qt4/pkg/DESCR-sqlite
+++ b/x11/qt4/pkg/DESCR-sqlite
@ -1 +0,0 @@
-database plugin (sqlite) for qt4.
--- a/x11/qt4/pkg/PFRAG.GCC4-examples
+++ b/x11/qt4/pkg/PFRAG.GCC4-examples
@ -1,212 +0,0 @@
-@comment $OpenBSD: PFRAG.GCC4-examples,v 1.5 2010/05/23 10:36:49 espie Exp $
-lib/qt4/demos/browser/
-lib/qt4/demos/browser/Info_mac.plist
-lib/qt4/demos/browser/addbookmarkdialog.ui
-lib/qt4/demos/browser/autosaver.cpp
-lib/qt4/demos/browser/autosaver.h
-lib/qt4/demos/browser/bookmarks.cpp
-lib/qt4/demos/browser/bookmarks.h
-lib/qt4/demos/browser/bookmarks.ui
-@bin lib/qt4/demos/browser/browser
-lib/qt4/demos/browser/browser.icns
-lib/qt4/demos/browser/browser.ico
-lib/qt4/demos/browser/browser.pro
-lib/qt4/demos/browser/browser.rc
-lib/qt4/demos/browser/browserapplication.cpp
-lib/qt4/demos/browser/browserapplication.h
-lib/qt4/demos/browser/browsermainwindow.cpp
-lib/qt4/demos/browser/browsermainwindow.h
-lib/qt4/demos/browser/chasewidget.cpp
-lib/qt4/demos/browser/chasewidget.h
-lib/qt4/demos/browser/cookiejar.cpp
-lib/qt4/demos/browser/cookiejar.h
-lib/qt4/demos/browser/cookies.ui
-lib/qt4/demos/browser/cookiesexceptions.ui
-lib/qt4/demos/browser/data/
-lib/qt4/demos/browser/data.qrc
-lib/qt4/demos/browser/data/addtab.png
-lib/qt4/demos/browser/data/browser.svg
-lib/qt4/demos/browser/data/closetab.png
-lib/qt4/demos/browser/data/data.qrc
-lib/qt4/demos/browser/data/defaultbookmarks.xbel
-lib/qt4/demos/browser/data/defaulticon.png
-lib/qt4/demos/browser/data/history.png
-lib/qt4/demos/browser/data/loading.gif
-lib/qt4/demos/browser/downloaditem.ui
-lib/qt4/demos/browser/downloadmanager.cpp
-lib/qt4/demos/browser/downloadmanager.h
-lib/qt4/demos/browser/downloads.ui
-lib/qt4/demos/browser/edittableview.cpp
-lib/qt4/demos/browser/edittableview.h
-lib/qt4/demos/browser/edittreeview.cpp
-lib/qt4/demos/browser/edittreeview.h
-lib/qt4/demos/browser/history.cpp
-lib/qt4/demos/browser/history.h
-lib/qt4/demos/browser/history.ui
-lib/qt4/demos/browser/htmls/
-lib/qt4/demos/browser/htmls.qrc
-lib/qt4/demos/browser/htmls/htmls.qrc
-lib/qt4/demos/browser/htmls/notfound.html
-lib/qt4/demos/browser/main.cpp
-lib/qt4/demos/browser/modelmenu.cpp
-lib/qt4/demos/browser/modelmenu.h
-lib/qt4/demos/browser/networkaccessmanager.cpp
-lib/qt4/demos/browser/networkaccessmanager.h
-lib/qt4/demos/browser/passworddialog.ui
-lib/qt4/demos/browser/proxy.ui
-lib/qt4/demos/browser/searchlineedit.cpp
-lib/qt4/demos/browser/searchlineedit.h
-lib/qt4/demos/browser/settings.cpp
-lib/qt4/demos/browser/settings.h
-lib/qt4/demos/browser/settings.ui
-lib/qt4/demos/browser/squeezelabel.cpp
-lib/qt4/demos/browser/squeezelabel.h
-lib/qt4/demos/browser/tabwidget.cpp
-lib/qt4/demos/browser/tabwidget.h
-lib/qt4/demos/browser/toolbarsearch.cpp
-lib/qt4/demos/browser/toolbarsearch.h
-lib/qt4/demos/browser/urllineedit.cpp
-lib/qt4/demos/browser/urllineedit.h
-lib/qt4/demos/browser/webview.cpp
-lib/qt4/demos/browser/webview.h
-lib/qt4/demos/browser/xbel.cpp
-lib/qt4/demos/browser/xbel.h
-lib/qt4/examples/webkit/
-lib/qt4/examples/webkit/domtraversal/
-@bin lib/qt4/examples/webkit/domtraversal/domtraversal
-lib/qt4/examples/webkit/domtraversal/domtraversal.pro
-lib/qt4/examples/webkit/domtraversal/main.cpp
-lib/qt4/examples/webkit/domtraversal/window.cpp
-lib/qt4/examples/webkit/domtraversal/window.h
-lib/qt4/examples/webkit/domtraversal/window.ui
-lib/qt4/examples/webkit/fancybrowser/
-@bin lib/qt4/examples/webkit/fancybrowser/fancybrowser
-lib/qt4/examples/webkit/fancybrowser/fancybrowser.pro
-lib/qt4/examples/webkit/fancybrowser/jquery.qrc
-lib/qt4/examples/webkit/fancybrowser/main.cpp
-lib/qt4/examples/webkit/fancybrowser/mainwindow.cpp
-lib/qt4/examples/webkit/fancybrowser/mainwindow.h
-lib/qt4/examples/webkit/formextractor/
-lib/qt4/examples/webkit/formextractor/form.html
-@bin lib/qt4/examples/webkit/formextractor/formextractor
-lib/qt4/examples/webkit/formextractor/formextractor.cpp
-lib/qt4/examples/webkit/formextractor/formextractor.h
-lib/qt4/examples/webkit/formextractor/formextractor.pro
-lib/qt4/examples/webkit/formextractor/formextractor.qrc
-lib/qt4/examples/webkit/formextractor/formextractor.ui
-lib/qt4/examples/webkit/formextractor/main.cpp
-lib/qt4/examples/webkit/formextractor/mainwindow.cpp
-lib/qt4/examples/webkit/formextractor/mainwindow.h
-lib/qt4/examples/webkit/framecapture/
-@bin lib/qt4/examples/webkit/framecapture/framecapture
-lib/qt4/examples/webkit/framecapture/framecapture.cpp
-lib/qt4/examples/webkit/framecapture/framecapture.h
-lib/qt4/examples/webkit/framecapture/main.cpp
-lib/qt4/examples/webkit/googlechat/
-lib/qt4/examples/webkit/googlechat/form.ui
-@bin lib/qt4/examples/webkit/googlechat/googlechat
-lib/qt4/examples/webkit/googlechat/googlechat.cpp
-lib/qt4/examples/webkit/googlechat/googlechat.h
-lib/qt4/examples/webkit/googlechat/googlechat.pro
-lib/qt4/examples/webkit/googlechat/main.cpp
-lib/qt4/examples/webkit/previewer/
-lib/qt4/examples/webkit/previewer/main.cpp
-lib/qt4/examples/webkit/previewer/mainwindow.cpp
-lib/qt4/examples/webkit/previewer/mainwindow.h
-@bin lib/qt4/examples/webkit/previewer/previewer
-lib/qt4/examples/webkit/previewer/previewer.cpp
-lib/qt4/examples/webkit/previewer/previewer.h
-lib/qt4/examples/webkit/previewer/previewer.pro
-lib/qt4/examples/webkit/previewer/previewer.ui
-lib/qt4/examples/webkit/simpleselector/
-lib/qt4/examples/webkit/simpleselector/main.cpp
-@bin lib/qt4/examples/webkit/simpleselector/simpleselector
-lib/qt4/examples/webkit/simpleselector/simpleselector.pro
-lib/qt4/examples/webkit/simpleselector/window.cpp
-lib/qt4/examples/webkit/simpleselector/window.h
-lib/qt4/examples/webkit/simpleselector/window.ui
-lib/qt4/examples/webkit/webkit.pro
-lib/qt4/examples/xmlpatterns/
-lib/qt4/examples/xmlpatterns/README
-lib/qt4/examples/xmlpatterns/filetree/
-@bin lib/qt4/examples/xmlpatterns/filetree/filetree
-lib/qt4/examples/xmlpatterns/filetree/filetree.cpp
-lib/qt4/examples/xmlpatterns/filetree/filetree.h
-lib/qt4/examples/xmlpatterns/filetree/filetree.pro
-lib/qt4/examples/xmlpatterns/filetree/main.cpp
-lib/qt4/examples/xmlpatterns/filetree/mainwindow.cpp
-lib/qt4/examples/xmlpatterns/filetree/mainwindow.h
-lib/qt4/examples/xmlpatterns/filetree/mainwindow.ui
-lib/qt4/examples/xmlpatterns/filetree/queries.qrc
-lib/qt4/examples/xmlpatterns/filetree/xmlsyntaxhighlighter.cpp
-lib/qt4/examples/xmlpatterns/filetree/xmlsyntaxhighlighter.h
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/main.cpp
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/mainwindow.ui
-@bin lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/queries.qrc
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.cpp
-lib/qt4/examples/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.h
-lib/qt4/examples/xmlpatterns/recipes/
-lib/qt4/examples/xmlpatterns/recipes/files/
-lib/qt4/examples/xmlpatterns/recipes/files/allRecipes.xq
-lib/qt4/examples/xmlpatterns/recipes/files/cookbook.xml
-lib/qt4/examples/xmlpatterns/recipes/files/liquidIngredientsInSoup.xq
-lib/qt4/examples/xmlpatterns/recipes/files/mushroomSoup.xq
-lib/qt4/examples/xmlpatterns/recipes/files/preparationLessThan30.xq
-lib/qt4/examples/xmlpatterns/recipes/files/preparationTimes.xq
-lib/qt4/examples/xmlpatterns/recipes/forms/
-lib/qt4/examples/xmlpatterns/recipes/forms/querywidget.ui
-lib/qt4/examples/xmlpatterns/recipes/main.cpp
-lib/qt4/examples/xmlpatterns/recipes/querymainwindow.cpp
-lib/qt4/examples/xmlpatterns/recipes/querymainwindow.h
-@bin lib/qt4/examples/xmlpatterns/recipes/recipes
-lib/qt4/examples/xmlpatterns/recipes/recipes.pro
-lib/qt4/examples/xmlpatterns/recipes/recipes.qrc
-lib/qt4/examples/xmlpatterns/recipes/xmlsyntaxhighlighter.cpp
-lib/qt4/examples/xmlpatterns/recipes/xmlsyntaxhighlighter.h
-lib/qt4/examples/xmlpatterns/schema/
-lib/qt4/examples/xmlpatterns/schema/files/
-lib/qt4/examples/xmlpatterns/schema/files/contact.xsd
-lib/qt4/examples/xmlpatterns/schema/files/invalid_contact.xml
-lib/qt4/examples/xmlpatterns/schema/files/invalid_order.xml
-lib/qt4/examples/xmlpatterns/schema/files/invalid_recipe.xml
-lib/qt4/examples/xmlpatterns/schema/files/order.xsd
-lib/qt4/examples/xmlpatterns/schema/files/recipe.xsd
-lib/qt4/examples/xmlpatterns/schema/files/valid_contact.xml
-lib/qt4/examples/xmlpatterns/schema/files/valid_order.xml
-lib/qt4/examples/xmlpatterns/schema/files/valid_recipe.xml
-lib/qt4/examples/xmlpatterns/schema/main.cpp
-lib/qt4/examples/xmlpatterns/schema/mainwindow.cpp
-lib/qt4/examples/xmlpatterns/schema/mainwindow.h
-@bin lib/qt4/examples/xmlpatterns/schema/schema
-lib/qt4/examples/xmlpatterns/schema/schema.pro
-lib/qt4/examples/xmlpatterns/schema/schema.qrc
-lib/qt4/examples/xmlpatterns/schema/xmlsyntaxhighlighter.cpp
-lib/qt4/examples/xmlpatterns/schema/xmlsyntaxhighlighter.h
-lib/qt4/examples/xmlpatterns/trafficinfo/
-lib/qt4/examples/xmlpatterns/trafficinfo/main.cpp
-lib/qt4/examples/xmlpatterns/trafficinfo/mainwindow.cpp
-lib/qt4/examples/xmlpatterns/trafficinfo/mainwindow.h
-lib/qt4/examples/xmlpatterns/trafficinfo/stationdialog.cpp
-lib/qt4/examples/xmlpatterns/trafficinfo/stationdialog.h
-lib/qt4/examples/xmlpatterns/trafficinfo/stationquery.cpp
-lib/qt4/examples/xmlpatterns/trafficinfo/stationquery.h
-lib/qt4/examples/xmlpatterns/trafficinfo/timequery.cpp
-lib/qt4/examples/xmlpatterns/trafficinfo/timequery.h
-@bin lib/qt4/examples/xmlpatterns/trafficinfo/trafficinfo
-lib/qt4/examples/xmlpatterns/trafficinfo/trafficinfo.pro
-lib/qt4/examples/xmlpatterns/xmlpatterns.pro
-lib/qt4/examples/xmlpatterns/xquery/
-lib/qt4/examples/xmlpatterns/xquery/globalVariables/
-lib/qt4/examples/xmlpatterns/xquery/globalVariables/globalVariables.pro
-lib/qt4/examples/xmlpatterns/xquery/globalVariables/globals.cpp
-lib/qt4/examples/xmlpatterns/xquery/globalVariables/globals.gccxml
-lib/qt4/examples/xmlpatterns/xquery/globalVariables/globals.html
-lib/qt4/examples/xmlpatterns/xquery/globalVariables/reportGlobals.xq
-lib/qt4/examples/xmlpatterns/xquery/xquery.pro
--- a/x11/qt4/pkg/PFRAG.GCC4-main
+++ b/x11/qt4/pkg/PFRAG.GCC4-main
@ -1,50 +0,0 @@
-@comment $OpenBSD: PFRAG.GCC4-main,v 1.3 2010/05/25 08:01:59 espie Exp $
-include/X11/qt4/Qt/QtWebKit
-include/X11/qt4/Qt/qgraphicswebview.h
-include/X11/qt4/Qt/qwebdatabase.h
-include/X11/qt4/Qt/qwebelement.h
-include/X11/qt4/Qt/qwebframe.h
-include/X11/qt4/Qt/qwebhistory.h
-include/X11/qt4/Qt/qwebhistoryinterface.h
-include/X11/qt4/Qt/qwebinspector.h
-include/X11/qt4/Qt/qwebkitglobal.h
-include/X11/qt4/Qt/qwebkitversion.h
-include/X11/qt4/Qt/qwebpage.h
-include/X11/qt4/Qt/qwebpluginfactory.h
-include/X11/qt4/Qt/qwebsecurityorigin.h
-include/X11/qt4/Qt/qwebsettings.h
-include/X11/qt4/Qt/qwebview.h
-include/X11/qt4/QtWebKit/
-include/X11/qt4/QtWebKit/QGraphicsWebView
-include/X11/qt4/QtWebKit/QWebDatabase
-include/X11/qt4/QtWebKit/QWebElement
-include/X11/qt4/QtWebKit/QWebElementCollection
-include/X11/qt4/QtWebKit/QWebFrame
-include/X11/qt4/QtWebKit/QWebHistory
-include/X11/qt4/QtWebKit/QWebHistoryInterface
-include/X11/qt4/QtWebKit/QWebHistoryItem
-include/X11/qt4/QtWebKit/QWebHitTestResult
-include/X11/qt4/QtWebKit/QWebInspector
-include/X11/qt4/QtWebKit/QWebPage
-include/X11/qt4/QtWebKit/QWebPluginFactory
-include/X11/qt4/QtWebKit/QWebSecurityOrigin
-include/X11/qt4/QtWebKit/QWebSettings
-include/X11/qt4/QtWebKit/QWebView
-include/X11/qt4/QtWebKit/QtWebKit
-include/X11/qt4/QtWebKit/qgraphicswebview.h
-include/X11/qt4/QtWebKit/qwebdatabase.h
-include/X11/qt4/QtWebKit/qwebelement.h
-include/X11/qt4/QtWebKit/qwebframe.h
-include/X11/qt4/QtWebKit/qwebhistory.h
-include/X11/qt4/QtWebKit/qwebhistoryinterface.h
-include/X11/qt4/QtWebKit/qwebinspector.h
-include/X11/qt4/QtWebKit/qwebkitglobal.h
-include/X11/qt4/QtWebKit/qwebkitversion.h
-include/X11/qt4/QtWebKit/qwebpage.h
-include/X11/qt4/QtWebKit/qwebpluginfactory.h
-include/X11/qt4/QtWebKit/qwebsecurityorigin.h
-include/X11/qt4/QtWebKit/qwebsettings.h
-include/X11/qt4/QtWebKit/qwebview.h
-lib/qt4/libQtWebKit.la
-lib/qt4/libQtWebKit.prl
-lib/qt4/pkgconfig/QtWebKit.pc
--- a/x11/qt4/pkg/PFRAG.GCC4-shared-main
+++ b/x11/qt4/pkg/PFRAG.GCC4-shared-main
@ -1,4 +0,0 @@
-@comment $OpenBSD: PFRAG.GCC4-shared-main,v 1.5 2010/06/21 16:40:52 espie Exp $
-@lib lib/libQtWebKit.so.${LIBQtWebKit_VERSION}
-@lib lib/qt4/libQtWebKit.so.${LIBQtWebKit_VERSION}
-lib/qt4/plugins/designer/libqwebview.so
--- a/x11/qt4/pkg/PFRAG.shared-debug
+++ b/x11/qt4/pkg/PFRAG.shared-debug
@ -1,27 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-debug,v 1.4 2005/12/31 15:59:50 espie Exp $
-@lib lib/libQt3Support_debug.so.${LIBQt3Support_debug_VERSION}
-@lib lib/libQtCore_debug.so.${LIBQtCore_debug_VERSION}
-@lib lib/libQtDesignerComponents_debug.so.${LIBQtDesignerComponents_debug_VERSION}
-@lib lib/libQtDesigner_debug.so.${LIBQtDesigner_debug_VERSION}
-@lib lib/libQtGui_debug.so.${LIBQtGui_debug_VERSION}
-@lib lib/libQtNetwork_debug.so.${LIBQtNetwork_debug_VERSION}
-@lib lib/libQtOpenGL_debug.so.${LIBQtOpenGL_debug_VERSION}
-@lib lib/libQtSql_debug.so.${LIBQtSql_debug_VERSION}
-@lib lib/libQtXml_debug.so.${LIBQtXml_debug_VERSION}
-@lib lib/qt4/libQt3Support_debug.so.${LIBQt3Support_debug_VERSION}
-@lib lib/qt4/libQtCore_debug.so.${LIBQtCore_debug_VERSION}
-@lib lib/qt4/libQtDesignerComponents_debug.so.${LIBQtDesignerComponents_debug_VERSION}
-@lib lib/qt4/libQtDesigner_debug.so.${LIBQtDesigner_debug_VERSION}
-@lib lib/qt4/libQtGui_debug.so.${LIBQtGui_debug_VERSION}
-@lib lib/qt4/libQtNetwork_debug.so.${LIBQtNetwork_debug_VERSION}
-@lib lib/qt4/libQtOpenGL_debug.so.${LIBQtOpenGL_debug_VERSION}
-@lib lib/qt4/libQtSql_debug.so.${LIBQtSql_debug_VERSION}
-@lib lib/qt4/libQtXml_debug.so.${LIBQtXml_debug_VERSION}
-lib/qt4/plugins/codecs/libqcncodecs_debug.so
-lib/qt4/plugins/codecs/libqjpcodecs_debug.so
-lib/qt4/plugins/codecs/libqkrcodecs_debug.so
-lib/qt4/plugins/codecs/libqtwcodecs_debug.so
-lib/qt4/plugins/designer/libqt3supportwidgets_debug.so
-lib/qt4/plugins/imageformats/libqjpeg_debug.so
-lib/qt4/plugins/sqldrivers/libqsqlmysql_debug.so
-lib/qt4/plugins/sqldrivers/libqsqlpsql_debug.so
--- a/x11/qt4/pkg/PFRAG.shared-examples
+++ b/x11/qt4/pkg/PFRAG.shared-examples
@ -1,12 +0,0 @@
-@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
-lib/qt4/plugins/designer/libarthurplugin.so
-lib/qt4/plugins/designer/libcontainerextension.so
-lib/qt4/plugins/designer/libcustomwidgetplugin.so
-lib/qt4/plugins/designer/libtaskmenuextension.so
-lib/qt4/plugins/designer/libworldtimeclockplugin.so
--- a/x11/qt4/pkg/PFRAG.shared-main
+++ b/x11/qt4/pkg/PFRAG.shared-main
@ -1,66 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.10 2011/09/07 09:54:07 espie Exp $
-%%GCC4%%
-@lib lib/libQt3Support.so.${LIBQt3Support_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}
-@lib lib/libQtHelp.so.${LIBQtHelp_VERSION}
-@lib lib/libQtMultimedia.so.${LIBQtMultimedia_VERSION}
-@lib lib/libQtNetwork.so.${LIBQtNetwork_VERSION}
-@lib lib/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
-@lib lib/libQtScript.so.${LIBQtScript_VERSION}
-@lib lib/libQtScriptTools.so.${LIBQtScriptTools_VERSION}
-@lib lib/libQtSql.so.${LIBQtSql_VERSION}
-@lib lib/libQtSvg.so.${LIBQtSvg_VERSION}
-@lib lib/libQtTest.so.${LIBQtTest_VERSION}
-@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/Qt/labs/shaders/libqmlshadersplugin.so
-lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
-@lib lib/qt4/libQt3Support.so.${LIBQt3Support_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}
-@lib lib/qt4/libQtHelp.so.${LIBQtHelp_VERSION}
-@lib lib/qt4/libQtMultimedia.so.${LIBQtMultimedia_VERSION}
-@lib lib/qt4/libQtNetwork.so.${LIBQtNetwork_VERSION}
-@lib lib/qt4/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
-@lib lib/qt4/libQtScript.so.${LIBQtScript_VERSION}
-@lib lib/qt4/libQtScriptTools.so.${LIBQtScriptTools_VERSION}
-@lib lib/qt4/libQtSql.so.${LIBQtSql_VERSION}
-@lib lib/qt4/libQtSvg.so.${LIBQtSvg_VERSION}
-@lib lib/qt4/libQtTest.so.${LIBQtTest_VERSION}
-@lib lib/qt4/libQtXml.so.${LIBQtXml_VERSION}
-@lib lib/qt4/libQtXmlPatterns.so.${LIBQtXmlPatterns_VERSION}
-@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/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
-lib/qt4/plugins/iconengines/libqsvgicon.so
-lib/qt4/plugins/imageformats/libqgif.so
-lib/qt4/plugins/imageformats/libqico.so
-lib/qt4/plugins/imageformats/libqjpeg.so
-lib/qt4/plugins/imageformats/libqmng.so
-lib/qt4/plugins/imageformats/libqsvg.so
-lib/qt4/plugins/imageformats/libqtiff.so
-lib/qt4/plugins/inputmethods/libqimsw-multi.so
-lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
-lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
-lib/qt4/plugins/script/libqtscriptdbus.so
--- a/x11/qt4/pkg/PFRAG.shared-mysql
+++ b/x11/qt4/pkg/PFRAG.shared-mysql
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-mysql,v 1.1.1.1 2005/07/04 11:10:15 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlmysql.so
--- a/x11/qt4/pkg/PFRAG.shared-postgresql
+++ b/x11/qt4/pkg/PFRAG.shared-postgresql
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-postgresql,v 1.1.1.1 2005/07/04 11:10:15 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlpsql.so
--- a/x11/qt4/pkg/PFRAG.shared-sqlite
+++ b/x11/qt4/pkg/PFRAG.shared-sqlite
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-sqlite,v 1.1 2006/05/15 21:09:39 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlite.so
--- a/x11/qt4/pkg/PFRAG.shared-sqlite2
+++ b/x11/qt4/pkg/PFRAG.shared-sqlite2
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-sqlite2,v 1.1 2006/05/15 21:09:39 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqlite2.so
--- a/x11/qt4/pkg/PFRAG.shared-tds
+++ b/x11/qt4/pkg/PFRAG.shared-tds
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-tds,v 1.1 2009/04/18 17:25:43 espie Exp $
-lib/qt4/plugins/sqldrivers/libqsqltds.so
--- a/x11/qt4/pkg/PLIST-debug
+++ b/x11/qt4/pkg/PLIST-debug
@ -1,5 +1,30 @@
-@comment $OpenBSD: PLIST-debug,v 1.5 2005/12/31 15:59:51 espie Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST-debug,v 1.6 2012/06/14 09:38:36 espie Exp $
+@lib lib/libQt3Support_debug.so.${LIBQt3Support_debug_VERSION}
+@lib lib/libQtCore_debug.so.${LIBQtCore_debug_VERSION}
+@lib lib/libQtDesignerComponents_debug.so.${LIBQtDesignerComponents_debug_VERSION}
+@lib lib/libQtDesigner_debug.so.${LIBQtDesigner_debug_VERSION}
+@lib lib/libQtGui_debug.so.${LIBQtGui_debug_VERSION}
+@lib lib/libQtNetwork_debug.so.${LIBQtNetwork_debug_VERSION}
+@lib lib/libQtOpenGL_debug.so.${LIBQtOpenGL_debug_VERSION}
+@lib lib/libQtSql_debug.so.${LIBQtSql_debug_VERSION}
+@lib lib/libQtXml_debug.so.${LIBQtXml_debug_VERSION}
+@lib lib/qt4/libQt3Support_debug.so.${LIBQt3Support_debug_VERSION}
+@lib lib/qt4/libQtCore_debug.so.${LIBQtCore_debug_VERSION}
+@lib lib/qt4/libQtDesignerComponents_debug.so.${LIBQtDesignerComponents_debug_VERSION}
+@lib lib/qt4/libQtDesigner_debug.so.${LIBQtDesigner_debug_VERSION}
+@lib lib/qt4/libQtGui_debug.so.${LIBQtGui_debug_VERSION}
+@lib lib/qt4/libQtNetwork_debug.so.${LIBQtNetwork_debug_VERSION}
+@lib lib/qt4/libQtOpenGL_debug.so.${LIBQtOpenGL_debug_VERSION}
+@lib lib/qt4/libQtSql_debug.so.${LIBQtSql_debug_VERSION}
+@lib lib/qt4/libQtXml_debug.so.${LIBQtXml_debug_VERSION}
+lib/qt4/plugins/codecs/libqcncodecs_debug.so
+lib/qt4/plugins/codecs/libqjpcodecs_debug.so
+lib/qt4/plugins/codecs/libqkrcodecs_debug.so
+lib/qt4/plugins/codecs/libqtwcodecs_debug.so
+lib/qt4/plugins/designer/libqt3supportwidgets_debug.so
+lib/qt4/plugins/imageformats/libqjpeg_debug.so
+lib/qt4/plugins/sqldrivers/libqsqlmysql_debug.so
+lib/qt4/plugins/sqldrivers/libqsqlpsql_debug.so
 lib/qt4/Qt3Support_debug.pc
 lib/qt4/QtCore_debug.pc
 lib/qt4/QtGui_debug.pc
--- a/x11/qt4/pkg/PLIST-examples
+++ b/x11/qt4/pkg/PLIST-examples
--- 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,8 +1,8 @@
-@comment $OpenBSD: PLIST-main,v 1.30 2011/11/06 12:44:04 espie Exp $
+@comment $OpenBSD: PLIST-main,v 1.31 2012/06/14 09:38:36 espie Exp $
@pkgpath x11/qt4
@pkgpath x11/qt4,-phonon
-%%SHARED%%
-%%GCC4%%
+@pkgpath x11/qt4,-sqlite
+@conflict qt4-sqlite-*
 bin/assistant4
 bin/designer4
 bin/findtr4
@ -34,6 +34,7 @@ include/X11/qt4/Qt/QtScriptTools
 include/X11/qt4/Qt/QtSql
 include/X11/qt4/Qt/QtSvg
 include/X11/qt4/Qt/QtTest
+include/X11/qt4/Qt/QtWebKit
 include/X11/qt4/Qt/QtXml
 include/X11/qt4/Qt/QtXmlPatterns
 include/X11/qt4/Qt/q3accel.h
@ -183,13 +184,16 @@ include/X11/qt4/Qt/qatomic.h
 include/X11/qt4/Qt/qatomic_alpha.h
 include/X11/qt4/Qt/qatomic_arch.h
 include/X11/qt4/Qt/qatomic_arm.h
+include/X11/qt4/Qt/qatomic_armv5.h
 include/X11/qt4/Qt/qatomic_armv6.h
+include/X11/qt4/Qt/qatomic_armv7.h
 include/X11/qt4/Qt/qatomic_avr32.h
 include/X11/qt4/Qt/qatomic_bfin.h
 include/X11/qt4/Qt/qatomic_bootstrap.h
 include/X11/qt4/Qt/qatomic_generic.h
 include/X11/qt4/Qt/qatomic_i386.h
 include/X11/qt4/Qt/qatomic_ia64.h
+include/X11/qt4/Qt/qatomic_integrity.h
 include/X11/qt4/Qt/qatomic_macosx.h
 include/X11/qt4/Qt/qatomic_mips.h
 include/X11/qt4/Qt/qatomic_parisc.h
@ -242,6 +246,7 @@ include/X11/qt4/Qt/qconfig-dist.h
 include/X11/qt4/Qt/qconfig-large.h
 include/X11/qt4/Qt/qconfig-medium.h
 include/X11/qt4/Qt/qconfig-minimal.h
+include/X11/qt4/Qt/qconfig-nacl.h
 include/X11/qt4/Qt/qconfig-small.h
 include/X11/qt4/Qt/qconfig.h
 include/X11/qt4/Qt/qcontainerfwd.h
@ -272,10 +277,13 @@ include/X11/qt4/Qt/qdbuspendingreply.h
 include/X11/qt4/Qt/qdbusreply.h
 include/X11/qt4/Qt/qdbusserver.h
 include/X11/qt4/Qt/qdbusservicewatcher.h
+include/X11/qt4/Qt/qdbusunixfiledescriptor.h
+include/X11/qt4/Qt/qdbusvirtualobject.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/qdeclarativedebug.h
 include/X11/qt4/Qt/qdeclarativeengine.h
 include/X11/qt4/Qt/qdeclarativeerror.h
 include/X11/qt4/Qt/qdeclarativeexpression.h
@ -340,6 +348,7 @@ include/X11/qt4/Qt/qformlayout.h
 include/X11/qt4/Qt/qframe.h
 include/X11/qt4/Qt/qfsfileengine.h
 include/X11/qt4/Qt/qftp.h
+include/X11/qt4/Qt/qfunctions_nacl.h
 include/X11/qt4/Qt/qfunctions_vxworks.h
 include/X11/qt4/Qt/qfunctions_wince.h
 include/X11/qt4/Qt/qfuture.h
@ -347,16 +356,20 @@ include/X11/qt4/Qt/qfutureinterface.h
 include/X11/qt4/Qt/qfuturesynchronizer.h
 include/X11/qt4/Qt/qfuturewatcher.h
 include/X11/qt4/Qt/qgenericmatrix.h
+include/X11/qt4/Qt/qgenericplugin_qpa.h
+include/X11/qt4/Qt/qgenericpluginfactory_qpa.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/qglfunctions.h
 include/X11/qt4/Qt/qglobal.h
 include/X11/qt4/Qt/qglpixelbuffer.h
 include/X11/qt4/Qt/qglscreen_qws.h
 include/X11/qt4/Qt/qglshaderprogram.h
+include/X11/qt4/Qt/qglyphrun.h
 include/X11/qt4/Qt/qgraphicsanchorlayout.h
 include/X11/qt4/Qt/qgraphicseffect.h
 include/X11/qt4/Qt/qgraphicsgridlayout.h
@ -369,8 +382,10 @@ include/X11/qt4/Qt/qgraphicsproxywidget.h
 include/X11/qt4/Qt/qgraphicsscene.h
 include/X11/qt4/Qt/qgraphicssceneevent.h
 include/X11/qt4/Qt/qgraphicssvgitem.h
+include/X11/qt4/Qt/qgraphicssystemhelper_symbian.h
 include/X11/qt4/Qt/qgraphicstransform.h
 include/X11/qt4/Qt/qgraphicsview.h
+include/X11/qt4/Qt/qgraphicswebview.h
 include/X11/qt4/Qt/qgraphicswidget.h
 include/X11/qt4/Qt/qgridlayout.h
 include/X11/qt4/Qt/qgroupbox.h
@ -390,10 +405,12 @@ include/X11/qt4/Qt/qhistorystate.h
 include/X11/qt4/Qt/qhostaddress.h
 include/X11/qt4/Qt/qhostinfo.h
 include/X11/qt4/Qt/qhttp.h
+include/X11/qt4/Qt/qhttpmultipart.h
 include/X11/qt4/Qt/qicon.h
 include/X11/qt4/Qt/qiconengine.h
 include/X11/qt4/Qt/qiconengineplugin.h
 include/X11/qt4/Qt/qiconset.h
+include/X11/qt4/Qt/qidentityproxymodel.h
 include/X11/qt4/Qt/qimage.h
 include/X11/qt4/Qt/qimageiohandler.h
 include/X11/qt4/Qt/qimagereader.h
@ -410,6 +427,7 @@ include/X11/qt4/Qt/qiterator.h
 include/X11/qt4/Qt/qkbd_qws.h
 include/X11/qt4/Qt/qkbddriverfactory_qws.h
 include/X11/qt4/Qt/qkbddriverplugin_qws.h
+include/X11/qt4/Qt/qkbdintegrity_qws.h
 include/X11/qt4/Qt/qkbdlinuxinput_qws.h
 include/X11/qt4/Qt/qkbdqnx_qws.h
 include/X11/qt4/Qt/qkbdtty_qws.h
@ -457,6 +475,7 @@ include/X11/qt4/Qt/qmouse_qws.h
 include/X11/qt4/Qt/qmousedriverfactory_qws.h
 include/X11/qt4/Qt/qmousedriverplugin_qws.h
 include/X11/qt4/Qt/qmouseeventtransition.h
+include/X11/qt4/Qt/qmouseintegrity_qws.h
 include/X11/qt4/Qt/qmouselinuxinput_qws.h
 include/X11/qt4/Qt/qmouselinuxtp_qws.h
 include/X11/qt4/Qt/qmousepc_qws.h
@ -472,6 +491,7 @@ include/X11/qt4/Qt/qnetworkconfiguration.h
 include/X11/qt4/Qt/qnetworkcookie.h
 include/X11/qt4/Qt/qnetworkcookiejar.h
 include/X11/qt4/Qt/qnetworkdiskcache.h
+include/X11/qt4/Qt/qnetworkfunctions_wince.h
 include/X11/qt4/Qt/qnetworkinterface.h
 include/X11/qt4/Qt/qnetworkproxy.h
 include/X11/qt4/Qt/qnetworkreply.h
@ -497,6 +517,17 @@ include/X11/qt4/Qt/qpixmap.h
 include/X11/qt4/Qt/qpixmapcache.h
 include/X11/qt4/Qt/qplaintextedit.h
 include/X11/qt4/Qt/qplastiquestyle.h
+include/X11/qt4/Qt/qplatformclipboard_qpa.h
+include/X11/qt4/Qt/qplatformcursor_qpa.h
+include/X11/qt4/Qt/qplatformeventloopintegration_qpa.h
+include/X11/qt4/Qt/qplatformfontdatabase_qpa.h
+include/X11/qt4/Qt/qplatformglcontext_qpa.h
+include/X11/qt4/Qt/qplatformintegration_qpa.h
+include/X11/qt4/Qt/qplatformintegrationplugin_qpa.h
+include/X11/qt4/Qt/qplatformnativeinterface_qpa.h
+include/X11/qt4/Qt/qplatformscreen_qpa.h
+include/X11/qt4/Qt/qplatformwindow_qpa.h
+include/X11/qt4/Qt/qplatformwindowformat_qpa.h
 include/X11/qt4/Qt/qplugin.h
 include/X11/qt4/Qt/qpluginloader.h
 include/X11/qt4/Qt/qpoint.h
@ -518,6 +549,7 @@ include/X11/qt4/Qt/qpushbutton.h
 include/X11/qt4/Qt/qquaternion.h
 include/X11/qt4/Qt/qqueue.h
 include/X11/qt4/Qt/qradiobutton.h
+include/X11/qt4/Qt/qrawfont.h
 include/X11/qt4/Qt/qreadwritelock.h
 include/X11/qt4/Qt/qrect.h
 include/X11/qt4/Qt/qregexp.h
@ -531,9 +563,11 @@ include/X11/qt4/Qt/qs60mainappui.h
 include/X11/qt4/Qt/qs60maindocument.h
 include/X11/qt4/Qt/qs60style.h
 include/X11/qt4/Qt/qscopedpointer.h
+include/X11/qt4/Qt/qscopedvaluerollback.h
 include/X11/qt4/Qt/qscreen_qws.h
 include/X11/qt4/Qt/qscreendriverfactory_qws.h
 include/X11/qt4/Qt/qscreendriverplugin_qws.h
+include/X11/qt4/Qt/qscreenintegrityfb_qws.h
 include/X11/qt4/Qt/qscreenlinuxfb_qws.h
 include/X11/qt4/Qt/qscreenproxy_qws.h
 include/X11/qt4/Qt/qscreenqnx_qws.h
@ -590,6 +624,7 @@ include/X11/qt4/Qt/qsql_odbc.h
 include/X11/qt4/Qt/qsql_psql.h
 include/X11/qt4/Qt/qsql_sqlite.h
 include/X11/qt4/Qt/qsql_sqlite2.h
+include/X11/qt4/Qt/qsql_symsql.h
 include/X11/qt4/Qt/qsql_tds.h
 include/X11/qt4/Qt/qsqldatabase.h
 include/X11/qt4/Qt/qsqldriver.h
@ -734,6 +769,21 @@ include/X11/qt4/Qt/qvfbhdr.h
 include/X11/qt4/Qt/qvideoframe.h
 include/X11/qt4/Qt/qvideosurfaceformat.h
 include/X11/qt4/Qt/qwaitcondition.h
+include/X11/qt4/Qt/qwebdatabase.h
+include/X11/qt4/Qt/qwebelement.h
+include/X11/qt4/Qt/qwebframe.h
+include/X11/qt4/Qt/qwebhistory.h
+include/X11/qt4/Qt/qwebhistoryinterface.h
+include/X11/qt4/Qt/qwebinspector.h
+include/X11/qt4/Qt/qwebkitglobal.h
+include/X11/qt4/Qt/qwebkitplatformplugin.h
+include/X11/qt4/Qt/qwebkitversion.h
+include/X11/qt4/Qt/qwebpage.h
+include/X11/qt4/Qt/qwebpluginfactory.h
+include/X11/qt4/Qt/qwebscriptworld.h
+include/X11/qt4/Qt/qwebsecurityorigin.h
+include/X11/qt4/Qt/qwebsettings.h
+include/X11/qt4/Qt/qwebview.h
 include/X11/qt4/Qt/qwhatsthis.h
 include/X11/qt4/Qt/qwidget.h
 include/X11/qt4/Qt/qwidgetaction.h
@ -745,6 +795,7 @@ include/X11/qt4/Qt/qwindowsstyle.h
 include/X11/qt4/Qt/qwindowsvistastyle.h
 include/X11/qt4/Qt/qwindowsxpstyle.h
 include/X11/qt4/Qt/qwindowsystem_qws.h
+include/X11/qt4/Qt/qwindowsysteminterface_qpa.h
 include/X11/qt4/Qt/qwizard.h
 include/X11/qt4/Qt/qwmatrix.h
 include/X11/qt4/Qt/qworkspace.h
@ -1076,6 +1127,7 @@ include/X11/qt4/QtCore/QAbstractListModel
 include/X11/qt4/QtCore/QAbstractState
 include/X11/qt4/QtCore/QAbstractTableModel
 include/X11/qt4/QtCore/QAbstractTransition
+include/X11/qt4/QtCore/QAnimationDriver
 include/X11/qt4/QtCore/QAnimationGroup
 include/X11/qt4/QtCore/QArgument
 include/X11/qt4/QtCore/QAtomicInt
@ -1195,6 +1247,7 @@ include/X11/qt4/QtCore/QMutableSetIterator
 include/X11/qt4/QtCore/QMutableStringListIterator
 include/X11/qt4/QtCore/QMutableVectorIterator
 include/X11/qt4/QtCore/QMutex
+include/X11/qt4/QtCore/QMutexData
 include/X11/qt4/QtCore/QMutexLocker
 include/X11/qt4/QtCore/QNoDebug
 include/X11/qt4/QtCore/QNoImplicitBoolCast
@ -1228,6 +1281,7 @@ include/X11/qt4/QtCore/QScopedPointer
 include/X11/qt4/QtCore/QScopedPointerArrayDeleter
 include/X11/qt4/QtCore/QScopedPointerDeleter
 include/X11/qt4/QtCore/QScopedPointerPodDeleter
+include/X11/qt4/QtCore/QScopedValueRollback
 include/X11/qt4/QtCore/QSemaphore
 include/X11/qt4/QtCore/QSequentialAnimationGroup
 include/X11/qt4/QtCore/QSet
@ -1346,13 +1400,16 @@ include/X11/qt4/QtCore/qatomic.h
 include/X11/qt4/QtCore/qatomic_alpha.h
 include/X11/qt4/QtCore/qatomic_arch.h
 include/X11/qt4/QtCore/qatomic_arm.h
+include/X11/qt4/QtCore/qatomic_armv5.h
 include/X11/qt4/QtCore/qatomic_armv6.h
+include/X11/qt4/QtCore/qatomic_armv7.h
 include/X11/qt4/QtCore/qatomic_avr32.h
 include/X11/qt4/QtCore/qatomic_bfin.h
 include/X11/qt4/QtCore/qatomic_bootstrap.h
 include/X11/qt4/QtCore/qatomic_generic.h
 include/X11/qt4/QtCore/qatomic_i386.h
 include/X11/qt4/QtCore/qatomic_ia64.h
+include/X11/qt4/QtCore/qatomic_integrity.h
 include/X11/qt4/QtCore/qatomic_macosx.h
 include/X11/qt4/QtCore/qatomic_mips.h
 include/X11/qt4/QtCore/qatomic_parisc.h
@ -1378,6 +1435,7 @@ include/X11/qt4/QtCore/qconfig-dist.h
 include/X11/qt4/QtCore/qconfig-large.h
 include/X11/qt4/QtCore/qconfig-medium.h
 include/X11/qt4/QtCore/qconfig-minimal.h
+include/X11/qt4/QtCore/qconfig-nacl.h
 include/X11/qt4/QtCore/qconfig-small.h
 include/X11/qt4/QtCore/qconfig.h
 include/X11/qt4/QtCore/qcontainerfwd.h
@ -1402,6 +1460,7 @@ include/X11/qt4/QtCore/qfileinfo.h
 include/X11/qt4/QtCore/qfilesystemwatcher.h
 include/X11/qt4/QtCore/qfinalstate.h
 include/X11/qt4/QtCore/qfsfileengine.h
+include/X11/qt4/QtCore/qfunctions_nacl.h
 include/X11/qt4/QtCore/qfunctions_vxworks.h
 include/X11/qt4/QtCore/qfunctions_wince.h
 include/X11/qt4/QtCore/qfuture.h
@ -1447,6 +1506,7 @@ include/X11/qt4/QtCore/qregexp.h
 include/X11/qt4/QtCore/qresource.h
 include/X11/qt4/QtCore/qrunnable.h
 include/X11/qt4/QtCore/qscopedpointer.h
+include/X11/qt4/QtCore/qscopedvaluerollback.h
 include/X11/qt4/QtCore/qsemaphore.h
 include/X11/qt4/QtCore/qsequentialanimationgroup.h
 include/X11/qt4/QtCore/qset.h
@ -1523,7 +1583,9 @@ include/X11/qt4/QtDBus/QDBusReply
 include/X11/qt4/QtDBus/QDBusServer
 include/X11/qt4/QtDBus/QDBusServiceWatcher
 include/X11/qt4/QtDBus/QDBusSignature
+include/X11/qt4/QtDBus/QDBusUnixFileDescriptor
 include/X11/qt4/QtDBus/QDBusVariant
+include/X11/qt4/QtDBus/QDBusVirtualObject
 include/X11/qt4/QtDBus/QtDBus
 include/X11/qt4/QtDBus/qdbusabstractadaptor.h
 include/X11/qt4/QtDBus/qdbusabstractinterface.h
@ -1542,10 +1604,13 @@ 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/QtDBus/qdbusunixfiledescriptor.h
+include/X11/qt4/QtDBus/qdbusvirtualobject.h
 include/X11/qt4/QtDeclarative/
 include/X11/qt4/QtDeclarative/QDeclarativeAttachedPropertiesFunc
 include/X11/qt4/QtDeclarative/QDeclarativeComponent
 include/X11/qt4/QtDeclarative/QDeclarativeContext
+include/X11/qt4/QtDeclarative/QDeclarativeDebuggingEnabler
 include/X11/qt4/QtDeclarative/QDeclarativeEngine
 include/X11/qt4/QtDeclarative/QDeclarativeError
 include/X11/qt4/QtDeclarative/QDeclarativeExpression
@ -1570,6 +1635,7 @@ 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/qdeclarativedebug.h
 include/X11/qt4/QtDeclarative/qdeclarativeengine.h
 include/X11/qt4/QtDeclarative/qdeclarativeerror.h
 include/X11/qt4/QtDeclarative/qdeclarativeexpression.h
@ -1699,6 +1765,8 @@ include/X11/qt4/QtGui/QAccessibleObject
 include/X11/qt4/QtGui/QAccessibleObjectEx
 include/X11/qt4/QtGui/QAccessiblePlugin
 include/X11/qt4/QtGui/QAccessibleSimpleEditableTextInterface
+include/X11/qt4/QtGui/QAccessibleTable2CellInterface
+include/X11/qt4/QtGui/QAccessibleTable2Interface
 include/X11/qt4/QtGui/QAccessibleTableInterface
 include/X11/qt4/QtGui/QAccessibleTextInterface
 include/X11/qt4/QtGui/QAccessibleValueInterface
@ -1782,9 +1850,13 @@ include/X11/qt4/QtGui/QFontMetricsF
 include/X11/qt4/QtGui/QFormLayout
 include/X11/qt4/QtGui/QFrame
 include/X11/qt4/QtGui/QGenericMatrix
+include/X11/qt4/QtGui/QGenericPlugin
+include/X11/qt4/QtGui/QGenericPluginFactory
+include/X11/qt4/QtGui/QGenericPluginFactoryInterface
 include/X11/qt4/QtGui/QGesture
 include/X11/qt4/QtGui/QGestureEvent
 include/X11/qt4/QtGui/QGestureRecognizer
+include/X11/qt4/QtGui/QGlyphRun
 include/X11/qt4/QtGui/QGradient
 include/X11/qt4/QtGui/QGradientStop
 include/X11/qt4/QtGui/QGradientStops
@ -1844,6 +1916,7 @@ include/X11/qt4/QtGui/QIconEnginePlugin
 include/X11/qt4/QtGui/QIconEnginePluginV2
 include/X11/qt4/QtGui/QIconEngineV2
 include/X11/qt4/QtGui/QIconSet
+include/X11/qt4/QtGui/QIdentityProxyModel
 include/X11/qt4/QtGui/QImage
 include/X11/qt4/QtGui/QImageIOHandler
 include/X11/qt4/QtGui/QImageIOHandlerFactoryInterface
@ -1858,7 +1931,9 @@ include/X11/qt4/QtGui/QInputContextPlugin
 include/X11/qt4/QtGui/QInputDialog
 include/X11/qt4/QtGui/QInputEvent
 include/X11/qt4/QtGui/QInputMethodEvent
+include/X11/qt4/QtGui/QIntMouseHandler
 include/X11/qt4/QtGui/QIntValidator
+include/X11/qt4/QtGui/QIntfbScreen
 include/X11/qt4/QtGui/QItemDelegate
 include/X11/qt4/QtGui/QItemEditorCreator
 include/X11/qt4/QtGui/QItemEditorCreatorBase
@ -1936,6 +2011,20 @@ include/X11/qt4/QtGui/QPixmapCache
 include/X11/qt4/QtGui/QPlainTextDocumentLayout
 include/X11/qt4/QtGui/QPlainTextEdit
 include/X11/qt4/QtGui/QPlastiqueStyle
+include/X11/qt4/QtGui/QPlatformClipboard
+include/X11/qt4/QtGui/QPlatformCursor
+include/X11/qt4/QtGui/QPlatformCursorImage
+include/X11/qt4/QtGui/QPlatformCursorPrivate
+include/X11/qt4/QtGui/QPlatformEventLoopIntegration
+include/X11/qt4/QtGui/QPlatformFontDatabase
+include/X11/qt4/QtGui/QPlatformGLContext
+include/X11/qt4/QtGui/QPlatformIntegration
+include/X11/qt4/QtGui/QPlatformIntegrationFactoryInterface
+include/X11/qt4/QtGui/QPlatformIntegrationPlugin
+include/X11/qt4/QtGui/QPlatformNativeInterface
+include/X11/qt4/QtGui/QPlatformScreen
+include/X11/qt4/QtGui/QPlatformWindow
+include/X11/qt4/QtGui/QPlatformWindowFormat
 include/X11/qt4/QtGui/QPolygon
 include/X11/qt4/QtGui/QPolygonF
 include/X11/qt4/QtGui/QPoolEntry
@ -1957,6 +2046,7 @@ include/X11/qt4/QtGui/QQnxScreen
 include/X11/qt4/QtGui/QQuaternion
 include/X11/qt4/QtGui/QRadialGradient
 include/X11/qt4/QtGui/QRadioButton
+include/X11/qt4/QtGui/QRawFont
 include/X11/qt4/QtGui/QRegExpValidator
 include/X11/qt4/QtGui/QRegion
 include/X11/qt4/QtGui/QResizeEvent
@ -2051,8 +2141,10 @@ include/X11/qt4/QtGui/QStyleOptionViewItemV4
 include/X11/qt4/QtGui/QStylePainter
 include/X11/qt4/QtGui/QStylePlugin
 include/X11/qt4/QtGui/QStyledItemDelegate
+include/X11/qt4/QtGui/QSupportedWritingSystems
 include/X11/qt4/QtGui/QSwipeGesture
 include/X11/qt4/QtGui/QSymbianEvent
+include/X11/qt4/QtGui/QSymbianGraphicsSystemHelper
 include/X11/qt4/QtGui/QSyntaxHighlighter
 include/X11/qt4/QtGui/QSystemTrayIcon
 include/X11/qt4/QtGui/QTabBar
@ -2135,6 +2227,7 @@ include/X11/qt4/QtGui/QWSDisplay
 include/X11/qt4/QtGui/QWSEmbedWidget
 include/X11/qt4/QtGui/QWSEvent
 include/X11/qt4/QtGui/QWSInputMethod
+include/X11/qt4/QtGui/QWSIntKeyboardHandler
 include/X11/qt4/QtGui/QWSInternalWindowInfo
 include/X11/qt4/QtGui/QWSKeyboardHandler
 include/X11/qt4/QtGui/QWSKeyboardHandlerFactoryInterface
@ -2173,6 +2266,7 @@ include/X11/qt4/QtGui/QWidgetList
 include/X11/qt4/QtGui/QWidgetMapper
 include/X11/qt4/QtGui/QWidgetSet
 include/X11/qt4/QtGui/QWindowStateChangeEvent
+include/X11/qt4/QtGui/QWindowSystemInterface
 include/X11/qt4/QtGui/QWindowsCEStyle
 include/X11/qt4/QtGui/QWindowsMime
 include/X11/qt4/QtGui/QWindowsMobileStyle
@ -2259,8 +2353,11 @@ include/X11/qt4/QtGui/qfontmetrics.h
 include/X11/qt4/QtGui/qformlayout.h
 include/X11/qt4/QtGui/qframe.h
 include/X11/qt4/QtGui/qgenericmatrix.h
+include/X11/qt4/QtGui/qgenericplugin_qpa.h
+include/X11/qt4/QtGui/qgenericpluginfactory_qpa.h
 include/X11/qt4/QtGui/qgesture.h
 include/X11/qt4/QtGui/qgesturerecognizer.h
+include/X11/qt4/QtGui/qglyphrun.h
 include/X11/qt4/QtGui/qgraphicsanchorlayout.h
 include/X11/qt4/QtGui/qgraphicseffect.h
 include/X11/qt4/QtGui/qgraphicsgridlayout.h
@ -2272,6 +2369,7 @@ include/X11/qt4/QtGui/qgraphicslinearlayout.h
 include/X11/qt4/QtGui/qgraphicsproxywidget.h
 include/X11/qt4/QtGui/qgraphicsscene.h
 include/X11/qt4/QtGui/qgraphicssceneevent.h
+include/X11/qt4/QtGui/qgraphicssystemhelper_symbian.h
 include/X11/qt4/QtGui/qgraphicstransform.h
 include/X11/qt4/QtGui/qgraphicsview.h
 include/X11/qt4/QtGui/qgraphicswidget.h
@ -2283,6 +2381,7 @@ include/X11/qt4/QtGui/qheaderview.h
 include/X11/qt4/QtGui/qicon.h
 include/X11/qt4/QtGui/qiconengine.h
 include/X11/qt4/QtGui/qiconengineplugin.h
+include/X11/qt4/QtGui/qidentityproxymodel.h
 include/X11/qt4/QtGui/qimage.h
 include/X11/qt4/QtGui/qimageiohandler.h
 include/X11/qt4/QtGui/qimagereader.h
@ -2297,6 +2396,7 @@ include/X11/qt4/QtGui/qitemselectionmodel.h
 include/X11/qt4/QtGui/qkbd_qws.h
 include/X11/qt4/QtGui/qkbddriverfactory_qws.h
 include/X11/qt4/QtGui/qkbddriverplugin_qws.h
+include/X11/qt4/QtGui/qkbdintegrity_qws.h
 include/X11/qt4/QtGui/qkbdlinuxinput_qws.h
 include/X11/qt4/QtGui/qkbdqnx_qws.h
 include/X11/qt4/QtGui/qkbdtty_qws.h
@ -2330,6 +2430,7 @@ include/X11/qt4/QtGui/qmouse_qws.h
 include/X11/qt4/QtGui/qmousedriverfactory_qws.h
 include/X11/qt4/QtGui/qmousedriverplugin_qws.h
 include/X11/qt4/QtGui/qmouseeventtransition.h
+include/X11/qt4/QtGui/qmouseintegrity_qws.h
 include/X11/qt4/QtGui/qmouselinuxinput_qws.h
 include/X11/qt4/QtGui/qmouselinuxtp_qws.h
 include/X11/qt4/QtGui/qmousepc_qws.h
@ -2350,6 +2451,17 @@ include/X11/qt4/QtGui/qpixmap.h
 include/X11/qt4/QtGui/qpixmapcache.h
 include/X11/qt4/QtGui/qplaintextedit.h
 include/X11/qt4/QtGui/qplastiquestyle.h
+include/X11/qt4/QtGui/qplatformclipboard_qpa.h
+include/X11/qt4/QtGui/qplatformcursor_qpa.h
+include/X11/qt4/QtGui/qplatformeventloopintegration_qpa.h
+include/X11/qt4/QtGui/qplatformfontdatabase_qpa.h
+include/X11/qt4/QtGui/qplatformglcontext_qpa.h
+include/X11/qt4/QtGui/qplatformintegration_qpa.h
+include/X11/qt4/QtGui/qplatformintegrationplugin_qpa.h
+include/X11/qt4/QtGui/qplatformnativeinterface_qpa.h
+include/X11/qt4/QtGui/qplatformscreen_qpa.h
+include/X11/qt4/QtGui/qplatformwindow_qpa.h
+include/X11/qt4/QtGui/qplatformwindowformat_qpa.h
 include/X11/qt4/QtGui/qpolygon.h
 include/X11/qt4/QtGui/qprintdialog.h
 include/X11/qt4/QtGui/qprintengine.h
@ -2364,6 +2476,7 @@ include/X11/qt4/QtGui/qproxystyle.h
 include/X11/qt4/QtGui/qpushbutton.h
 include/X11/qt4/QtGui/qquaternion.h
 include/X11/qt4/QtGui/qradiobutton.h
+include/X11/qt4/QtGui/qrawfont.h
 include/X11/qt4/QtGui/qregion.h
 include/X11/qt4/QtGui/qrgb.h
 include/X11/qt4/QtGui/qrubberband.h
@ -2374,6 +2487,7 @@ include/X11/qt4/QtGui/qs60style.h
 include/X11/qt4/QtGui/qscreen_qws.h
 include/X11/qt4/QtGui/qscreendriverfactory_qws.h
 include/X11/qt4/QtGui/qscreendriverplugin_qws.h
+include/X11/qt4/QtGui/qscreenintegrityfb_qws.h
 include/X11/qt4/QtGui/qscreenlinuxfb_qws.h
 include/X11/qt4/QtGui/qscreenproxy_qws.h
 include/X11/qt4/QtGui/qscreenqnx_qws.h
@ -2452,6 +2566,7 @@ include/X11/qt4/QtGui/qwindowsstyle.h
 include/X11/qt4/QtGui/qwindowsvistastyle.h
 include/X11/qt4/QtGui/qwindowsxpstyle.h
 include/X11/qt4/QtGui/qwindowsystem_qws.h
+include/X11/qt4/QtGui/qwindowsysteminterface_qpa.h
 include/X11/qt4/QtGui/qwizard.h
 include/X11/qt4/QtGui/qwmatrix.h
 include/X11/qt4/QtGui/qworkspace.h
@ -2524,6 +2639,8 @@ include/X11/qt4/QtNetwork/QHostAddress
 include/X11/qt4/QtNetwork/QHostInfo
 include/X11/qt4/QtNetwork/QHttp
 include/X11/qt4/QtNetwork/QHttpHeader
+include/X11/qt4/QtNetwork/QHttpMultiPart
+include/X11/qt4/QtNetwork/QHttpPart
 include/X11/qt4/QtNetwork/QHttpRequestHeader
 include/X11/qt4/QtNetwork/QHttpResponseHeader
 include/X11/qt4/QtNetwork/QIPv6Address
@ -2564,6 +2681,7 @@ include/X11/qt4/QtNetwork/qftp.h
 include/X11/qt4/QtNetwork/qhostaddress.h
 include/X11/qt4/QtNetwork/qhostinfo.h
 include/X11/qt4/QtNetwork/qhttp.h
+include/X11/qt4/QtNetwork/qhttpmultipart.h
 include/X11/qt4/QtNetwork/qlocalserver.h
 include/X11/qt4/QtNetwork/qlocalsocket.h
 include/X11/qt4/QtNetwork/qnetworkaccessmanager.h
@ -2572,6 +2690,7 @@ include/X11/qt4/QtNetwork/qnetworkconfiguration.h
 include/X11/qt4/QtNetwork/qnetworkcookie.h
 include/X11/qt4/QtNetwork/qnetworkcookiejar.h
 include/X11/qt4/QtNetwork/qnetworkdiskcache.h
+include/X11/qt4/QtNetwork/qnetworkfunctions_wince.h
 include/X11/qt4/QtNetwork/qnetworkinterface.h
 include/X11/qt4/QtNetwork/qnetworkproxy.h
 include/X11/qt4/QtNetwork/qnetworkreply.h
@ -2595,6 +2714,8 @@ include/X11/qt4/QtOpenGL/QGLContext
 include/X11/qt4/QtOpenGL/QGLFormat
 include/X11/qt4/QtOpenGL/QGLFramebufferObject
 include/X11/qt4/QtOpenGL/QGLFramebufferObjectFormat
+include/X11/qt4/QtOpenGL/QGLFunctions
+include/X11/qt4/QtOpenGL/QGLFunctionsPrivate
 include/X11/qt4/QtOpenGL/QGLPixelBuffer
 include/X11/qt4/QtOpenGL/QGLScreen
 include/X11/qt4/QtOpenGL/QGLScreenSurfaceFunctions
@ -2610,6 +2731,7 @@ 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/qglfunctions.h
 include/X11/qt4/QtOpenGL/qglpixelbuffer.h
 include/X11/qt4/QtOpenGL/qglscreen_qws.h
 include/X11/qt4/QtOpenGL/qglshaderprogram.h
@ -2682,6 +2804,8 @@ include/X11/qt4/QtSql/QSqlRelationalDelegate
 include/X11/qt4/QtSql/QSqlRelationalTableModel
 include/X11/qt4/QtSql/QSqlResult
 include/X11/qt4/QtSql/QSqlTableModel
+include/X11/qt4/QtSql/QSymSQLDriver
+include/X11/qt4/QtSql/QSymSQLResult
 include/X11/qt4/QtSql/QTDSDriver
 include/X11/qt4/QtSql/QTDSResult
 include/X11/qt4/QtSql/QtSql
@ -2694,6 +2818,7 @@ include/X11/qt4/QtSql/qsql_odbc.h
 include/X11/qt4/QtSql/qsql_psql.h
 include/X11/qt4/QtSql/qsql_sqlite.h
 include/X11/qt4/QtSql/qsql_sqlite2.h
+include/X11/qt4/QtSql/qsql_symsql.h
 include/X11/qt4/QtSql/qsql_tds.h
 include/X11/qt4/QtSql/qsqldatabase.h
 include/X11/qt4/QtSql/qsqldriver.h
@ -2774,6 +2899,48 @@ include/X11/qt4/QtUiTools/
 include/X11/qt4/QtUiTools/QUiLoader
 include/X11/qt4/QtUiTools/QtUiTools
 include/X11/qt4/QtUiTools/quiloader.h
+include/X11/qt4/QtWebKit/
+include/X11/qt4/QtWebKit/QGraphicsWebView
+include/X11/qt4/QtWebKit/QWebDatabase
+include/X11/qt4/QtWebKit/QWebElement
+include/X11/qt4/QtWebKit/QWebElementCollection
+include/X11/qt4/QtWebKit/QWebFrame
+include/X11/qt4/QtWebKit/QWebFullScreenVideoHandler
+include/X11/qt4/QtWebKit/QWebHapticFeedbackPlayer
+include/X11/qt4/QtWebKit/QWebHistory
+include/X11/qt4/QtWebKit/QWebHistoryInterface
+include/X11/qt4/QtWebKit/QWebHistoryItem
+include/X11/qt4/QtWebKit/QWebHitTestResult
+include/X11/qt4/QtWebKit/QWebInspector
+include/X11/qt4/QtWebKit/QWebKitPlatformPlugin
+include/X11/qt4/QtWebKit/QWebNotificationData
+include/X11/qt4/QtWebKit/QWebNotificationPresenter
+include/X11/qt4/QtWebKit/QWebPage
+include/X11/qt4/QtWebKit/QWebPluginFactory
+include/X11/qt4/QtWebKit/QWebScriptWorld
+include/X11/qt4/QtWebKit/QWebSecurityOrigin
+include/X11/qt4/QtWebKit/QWebSelectData
+include/X11/qt4/QtWebKit/QWebSelectMethod
+include/X11/qt4/QtWebKit/QWebSettings
+include/X11/qt4/QtWebKit/QWebTouchModifier
+include/X11/qt4/QtWebKit/QWebView
+include/X11/qt4/QtWebKit/QtWebKit
+include/X11/qt4/QtWebKit/qgraphicswebview.h
+include/X11/qt4/QtWebKit/qwebdatabase.h
+include/X11/qt4/QtWebKit/qwebelement.h
+include/X11/qt4/QtWebKit/qwebframe.h
+include/X11/qt4/QtWebKit/qwebhistory.h
+include/X11/qt4/QtWebKit/qwebhistoryinterface.h
+include/X11/qt4/QtWebKit/qwebinspector.h
+include/X11/qt4/QtWebKit/qwebkitglobal.h
+include/X11/qt4/QtWebKit/qwebkitplatformplugin.h
+include/X11/qt4/QtWebKit/qwebkitversion.h
+include/X11/qt4/QtWebKit/qwebpage.h
+include/X11/qt4/QtWebKit/qwebpluginfactory.h
+include/X11/qt4/QtWebKit/qwebscriptworld.h
+include/X11/qt4/QtWebKit/qwebsecurityorigin.h
+include/X11/qt4/QtWebKit/qwebsettings.h
+include/X11/qt4/QtWebKit/qwebview.h
 include/X11/qt4/QtXml/
 include/X11/qt4/QtXml/QDomAttr
 include/X11/qt4/QtXml/QDomCDATASection
@ -2943,6 +3110,27 @@ include/X11/qt4/phonon/videowidgetinterface.h
 include/X11/qt4/phonon/volumefadereffect.h
 include/X11/qt4/phonon/volumefaderinterface.h
 include/X11/qt4/phonon/volumeslider.h
+@lib lib/libQt3Support.so.${LIBQt3Support_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}
+@lib lib/libQtHelp.so.${LIBQtHelp_VERSION}
+@lib lib/libQtMultimedia.so.${LIBQtMultimedia_VERSION}
+@lib lib/libQtNetwork.so.${LIBQtNetwork_VERSION}
+@lib lib/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
+@lib lib/libQtScript.so.${LIBQtScript_VERSION}
+@lib lib/libQtScriptTools.so.${LIBQtScriptTools_VERSION}
+@lib lib/libQtSql.so.${LIBQtSql_VERSION}
+@lib lib/libQtSvg.so.${LIBQtSvg_VERSION}
+@lib lib/libQtTest.so.${LIBQtTest_VERSION}
+@lib lib/libQtWebKit.so.${LIBQtWebKit_VERSION}
+@lib lib/libQtXml.so.${LIBQtXml_VERSION}
+@lib lib/libQtXmlPatterns.so.${LIBQtXmlPatterns_VERSION}
+@lib lib/libphonon.so.${LIBphonon_VERSION}
 lib/qt4/
 lib/qt4/bin/
@bin lib/qt4/bin/assistant
@ -2965,6 +3153,7 @@ lib/qt4/bin/moc4
@bin lib/qt4/bin/qhelpconverter
@bin lib/qt4/bin/qhelpgenerator
@bin lib/qt4/bin/qmake
+@bin lib/qt4/bin/qmlplugindump
@bin lib/qt4/bin/qmlviewer
@bin lib/qt4/bin/qt3to4
@bin lib/qt4/bin/qtconfig
@ -2979,56 +3168,84 @@ lib/qt4/imports/
 lib/qt4/imports/Qt/
 lib/qt4/imports/Qt/labs/
 lib/qt4/imports/Qt/labs/folderlistmodel/
+lib/qt4/imports/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so
 lib/qt4/imports/Qt/labs/folderlistmodel/qmldir
 lib/qt4/imports/Qt/labs/gestures/
+lib/qt4/imports/Qt/labs/gestures/libqmlgesturesplugin.so
 lib/qt4/imports/Qt/labs/gestures/qmldir
 lib/qt4/imports/Qt/labs/particles/
+lib/qt4/imports/Qt/labs/particles/libqmlparticlesplugin.so
 lib/qt4/imports/Qt/labs/particles/qmldir
 lib/qt4/imports/Qt/labs/shaders/
+lib/qt4/imports/Qt/labs/shaders/libqmlshadersplugin.so
 lib/qt4/imports/Qt/labs/shaders/qmldir
 lib/qt4/imports/QtWebKit/
+lib/qt4/imports/QtWebKit/libqmlwebkitplugin.so
 lib/qt4/imports/QtWebKit/qmldir
 lib/qt4/include
 lib/qt4/libQt3Support.la
 lib/qt4/libQt3Support.prl
+@lib lib/qt4/libQt3Support.so.${LIBQt3Support_VERSION}
 lib/qt4/libQtCLucene.la
 lib/qt4/libQtCLucene.prl
+@lib lib/qt4/libQtCLucene.so.${LIBQtCLucene_VERSION}
 lib/qt4/libQtCore.la
 lib/qt4/libQtCore.prl
+@lib lib/qt4/libQtCore.so.${LIBQtCore_VERSION}
 lib/qt4/libQtDBus.la
 lib/qt4/libQtDBus.prl
+@lib lib/qt4/libQtDBus.so.${LIBQtDBus_VERSION}
 lib/qt4/libQtDeclarative.la
 lib/qt4/libQtDeclarative.prl
+@lib lib/qt4/libQtDeclarative.so.${LIBQtDeclarative_VERSION}
 lib/qt4/libQtDesigner.prl
+@lib lib/qt4/libQtDesigner.so.${LIBQtDesigner_VERSION}
 lib/qt4/libQtDesignerComponents.prl
+@lib lib/qt4/libQtDesignerComponents.so.${LIBQtDesignerComponents_VERSION}
 lib/qt4/libQtGui.la
 lib/qt4/libQtGui.prl
+@lib lib/qt4/libQtGui.so.${LIBQtGui_VERSION}
 lib/qt4/libQtHelp.la
 lib/qt4/libQtHelp.prl
+@lib lib/qt4/libQtHelp.so.${LIBQtHelp_VERSION}
 lib/qt4/libQtMultimedia.la
 lib/qt4/libQtMultimedia.prl
+@lib lib/qt4/libQtMultimedia.so.${LIBQtMultimedia_VERSION}
 lib/qt4/libQtNetwork.la
 lib/qt4/libQtNetwork.prl
+@lib lib/qt4/libQtNetwork.so.${LIBQtNetwork_VERSION}
 lib/qt4/libQtOpenGL.la
 lib/qt4/libQtOpenGL.prl
+@lib lib/qt4/libQtOpenGL.so.${LIBQtOpenGL_VERSION}
 lib/qt4/libQtScript.la
 lib/qt4/libQtScript.prl
+@lib lib/qt4/libQtScript.so.${LIBQtScript_VERSION}
 lib/qt4/libQtScriptTools.la
 lib/qt4/libQtScriptTools.prl
+@lib lib/qt4/libQtScriptTools.so.${LIBQtScriptTools_VERSION}
 lib/qt4/libQtSql.la
 lib/qt4/libQtSql.prl
+@lib lib/qt4/libQtSql.so.${LIBQtSql_VERSION}
 lib/qt4/libQtSvg.la
 lib/qt4/libQtSvg.prl
+@lib lib/qt4/libQtSvg.so.${LIBQtSvg_VERSION}
 lib/qt4/libQtTest.la
 lib/qt4/libQtTest.prl
+@lib lib/qt4/libQtTest.so.${LIBQtTest_VERSION}
 lib/qt4/libQtUiTools.a
 lib/qt4/libQtUiTools.prl
+lib/qt4/libQtWebKit.la
+lib/qt4/libQtWebKit.prl
+@lib lib/qt4/libQtWebKit.so.${LIBQtWebKit_VERSION}
 lib/qt4/libQtXml.la
 lib/qt4/libQtXml.prl
+@lib lib/qt4/libQtXml.so.${LIBQtXml_VERSION}
 lib/qt4/libQtXmlPatterns.la
 lib/qt4/libQtXmlPatterns.prl
+@lib lib/qt4/libQtXmlPatterns.so.${LIBQtXmlPatterns_VERSION}
 lib/qt4/libphonon.la
 lib/qt4/libphonon.prl
+@lib lib/qt4/libphonon.so.${LIBphonon_VERSION}
 lib/qt4/mkspecs/
 lib/qt4/mkspecs/aix-g++/
 lib/qt4/mkspecs/aix-g++-64/
@ -3048,17 +3265,33 @@ 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/clang.conf
+lib/qt4/mkspecs/common/g++-base.conf
+lib/qt4/mkspecs/common/g++-macx.conf
+lib/qt4/mkspecs/common/g++-unix.conf
 lib/qt4/mkspecs/common/g++.conf
+lib/qt4/mkspecs/common/gcc-base-macx.conf
+lib/qt4/mkspecs/common/gcc-base-unix.conf
+lib/qt4/mkspecs/common/gcc-base.conf
+lib/qt4/mkspecs/common/ghs-base-integrity.conf
+lib/qt4/mkspecs/common/integrity/
+lib/qt4/mkspecs/common/integrity/qplatformdefs.h
 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/
 lib/qt4/mkspecs/common/mac.conf
+lib/qt4/mkspecs/common/mac/qplatformdefs.h
 lib/qt4/mkspecs/common/posix/
 lib/qt4/mkspecs/common/posix/qplatformdefs.h
+lib/qt4/mkspecs/common/qcc-base-qnx.conf
+lib/qt4/mkspecs/common/qcc-base.conf
+lib/qt4/mkspecs/common/qnx/
+lib/qt4/mkspecs/common/qnx/qmake.conf
+lib/qt4/mkspecs/common/qnx/qplatformdefs.h
 lib/qt4/mkspecs/common/qws.conf
 lib/qt4/mkspecs/common/symbian/
 lib/qt4/mkspecs/common/symbian/appCaptionForTranslation.cpp
+lib/qt4/mkspecs/common/symbian/backup_registration.xml
 lib/qt4/mkspecs/common/symbian/header-wrappers/
 lib/qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h
 lib/qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h
@ -3105,11 +3338,13 @@ lib/qt4/mkspecs/features/dbusadaptors.prf
 lib/qt4/mkspecs/features/dbusinterfaces.prf
 lib/qt4/mkspecs/features/debug.prf
 lib/qt4/mkspecs/features/debug_and_release.prf
+lib/qt4/mkspecs/features/declarative_debug.prf
 lib/qt4/mkspecs/features/default_post.prf
 lib/qt4/mkspecs/features/default_pre.prf
 lib/qt4/mkspecs/features/designer.prf
 lib/qt4/mkspecs/features/dll.prf
 lib/qt4/mkspecs/features/egl.prf
+lib/qt4/mkspecs/features/enable_backup.prf
 lib/qt4/mkspecs/features/exclusive_builds.prf
 lib/qt4/mkspecs/features/help.prf
 lib/qt4/mkspecs/features/include_source_dir.prf
@ -3180,6 +3415,7 @@ lib/qt4/mkspecs/features/uitools.prf
 lib/qt4/mkspecs/features/unix/
 lib/qt4/mkspecs/features/unix/bsymbolic_functions.prf
 lib/qt4/mkspecs/features/unix/dylib.prf
+lib/qt4/mkspecs/features/unix/gdb_dwarf_index.prf
 lib/qt4/mkspecs/features/unix/hide_symbols.prf
 lib/qt4/mkspecs/features/unix/largefile.prf
 lib/qt4/mkspecs/features/unix/opengl.prf
@ -3221,12 +3457,9 @@ lib/qt4/mkspecs/features/yacc.prf
 lib/qt4/mkspecs/freebsd-g++/
 lib/qt4/mkspecs/freebsd-g++/qmake.conf
 lib/qt4/mkspecs/freebsd-g++/qplatformdefs.h
-lib/qt4/mkspecs/freebsd-g++34/
-lib/qt4/mkspecs/freebsd-g++34/qmake.conf
-lib/qt4/mkspecs/freebsd-g++34/qplatformdefs.h
-lib/qt4/mkspecs/freebsd-g++40/
-lib/qt4/mkspecs/freebsd-g++40/qmake.conf
-lib/qt4/mkspecs/freebsd-g++40/qplatformdefs.h
+lib/qt4/mkspecs/freebsd-g++46/
+lib/qt4/mkspecs/freebsd-g++46/qmake.conf
+lib/qt4/mkspecs/freebsd-g++46/qplatformdefs.h
 lib/qt4/mkspecs/freebsd-icc/
 lib/qt4/mkspecs/freebsd-icc/qmake.conf
 lib/qt4/mkspecs/freebsd-icc/qplatformdefs.h
@ -3269,6 +3502,9 @@ lib/qt4/mkspecs/irix-g++-64/qmake.conf
 lib/qt4/mkspecs/irix-g++-64/qplatformdefs.h
 lib/qt4/mkspecs/irix-g++/qmake.conf
 lib/qt4/mkspecs/irix-g++/qplatformdefs.h
+lib/qt4/mkspecs/linux-arm-gnueabi-g++/
+lib/qt4/mkspecs/linux-arm-gnueabi-g++/qmake.conf
+lib/qt4/mkspecs/linux-arm-gnueabi-g++/qplatformdefs.h
 lib/qt4/mkspecs/linux-cxx/
 lib/qt4/mkspecs/linux-cxx/qmake.conf
 lib/qt4/mkspecs/linux-cxx/qplatformdefs.h
@ -3361,10 +3597,35 @@ lib/qt4/mkspecs/openbsd-g++4/qmake.conf
 lib/qt4/mkspecs/openbsd-g++4/qplatformdefs.h
@comment lib/qt4/mkspecs/openbsd-g++4/qplatformdefs.h.orig
 lib/qt4/mkspecs/qconfig.pri
+lib/qt4/mkspecs/qpa/
+lib/qt4/mkspecs/qpa/common/
+lib/qt4/mkspecs/qpa/common/g++-base-macx-iphone.conf
+lib/qt4/mkspecs/qpa/common/g++-base-macx-iphonedevice.conf
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++/
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qmake.conf
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv6/qplatformdefs.h
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qmake.conf
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++-armv7-nothumb/qplatformdefs.h
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++/qmake.conf
+lib/qt4/mkspecs/qpa/macx-iphonedevice-g++/qplatformdefs.h
+lib/qt4/mkspecs/qpa/macx-iphonesimulator-g++/
+lib/qt4/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf
+lib/qt4/mkspecs/qpa/macx-iphonesimulator-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/
 lib/qt4/mkspecs/qws/freebsd-generic-g++/
 lib/qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
 lib/qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/integrity-arm-cxarm/
+lib/qt4/mkspecs/qws/integrity-arm-cxarm/qmake.conf
+lib/qt4/mkspecs/qws/integrity-arm-cxarm/qplatformdefs.h
+lib/qt4/mkspecs/qws/integrity-ppc-cxppc/
+lib/qt4/mkspecs/qws/integrity-ppc-cxppc/qmake.conf
+lib/qt4/mkspecs/qws/integrity-ppc-cxppc/qplatformdefs.h
+lib/qt4/mkspecs/qws/integrity-x86-cx86/
+lib/qt4/mkspecs/qws/integrity-x86-cx86/qmake.conf
+lib/qt4/mkspecs/qws/integrity-x86-cx86/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
@ -3401,6 +3662,9 @@ lib/qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/linux-mips-g++/
 lib/qt4/mkspecs/qws/linux-mips-g++/qmake.conf
 lib/qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/linux-nacl-g++/
+lib/qt4/mkspecs/qws/linux-nacl-g++/qmake.conf
+lib/qt4/mkspecs/qws/linux-nacl-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/linux-powerpc-g++/
 lib/qt4/mkspecs/qws/linux-powerpc-g++/qmake.conf
 lib/qt4/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
@ -3425,6 +3689,24 @@ lib/qt4/mkspecs/qws/linux-zylonite-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/macx-generic-g++/
 lib/qt4/mkspecs/qws/macx-generic-g++/qmake.conf
 lib/qt4/mkspecs/qws/macx-generic-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/macx-nacl-g++/
+lib/qt4/mkspecs/qws/macx-nacl-g++/qmake.conf
+lib/qt4/mkspecs/qws/macx-nacl-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/qnx-arm-g++/
+lib/qt4/mkspecs/qws/qnx-arm-g++/qmake.conf
+lib/qt4/mkspecs/qws/qnx-arm-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/qnx-armv7-g++/
+lib/qt4/mkspecs/qws/qnx-armv7-g++/qmake.conf
+lib/qt4/mkspecs/qws/qnx-armv7-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/qnx-generic-g++/
+lib/qt4/mkspecs/qws/qnx-generic-g++/qmake.conf
+lib/qt4/mkspecs/qws/qnx-generic-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/qnx-i386-g++/
+lib/qt4/mkspecs/qws/qnx-i386-g++/qmake.conf
+lib/qt4/mkspecs/qws/qnx-i386-g++/qplatformdefs.h
+lib/qt4/mkspecs/qws/qnx-ppc-g++/
+lib/qt4/mkspecs/qws/qnx-ppc-g++/qmake.conf
+lib/qt4/mkspecs/qws/qnx-ppc-g++/qplatformdefs.h
 lib/qt4/mkspecs/qws/solaris-generic-g++/
 lib/qt4/mkspecs/qws/solaris-generic-g++/qmake.conf
 lib/qt4/mkspecs/qws/solaris-generic-g++/qplatformdefs.h
@ -3489,28 +3771,48 @@ lib/qt4/mkspecs/unixware-g++/
 lib/qt4/mkspecs/unixware-g++/qmake.conf
 lib/qt4/mkspecs/unixware-g++/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/
+lib/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/
+lib/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf
+lib/qt4/mkspecs/unsupported/blackberry-armv7le-qcc/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/blackberry-x86-qcc/
+lib/qt4/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf
+lib/qt4/mkspecs/unsupported/blackberry-x86-qcc/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/linux-armcc/
+lib/qt4/mkspecs/unsupported/linux-armcc/qmake.conf
+lib/qt4/mkspecs/unsupported/linux-armcc/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/linux-clang/
+lib/qt4/mkspecs/unsupported/linux-clang/qmake.conf
+lib/qt4/mkspecs/unsupported/linux-clang/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/linux-host-g++/
 lib/qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
 lib/qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/linux-scratchbox2-g++/
 lib/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
 lib/qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
-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/macx-clang/
+lib/qt4/mkspecs/unsupported/macx-clang/Info.plist.app
+lib/qt4/mkspecs/unsupported/macx-clang/Info.plist.lib
+lib/qt4/mkspecs/unsupported/macx-clang/qmake.conf
+lib/qt4/mkspecs/unsupported/macx-clang/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/qnx-X11-g++/
+lib/qt4/mkspecs/unsupported/qnx-X11-g++/qmake.conf
+lib/qt4/mkspecs/unsupported/qnx-X11-g++/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/qnx-armv7le-qcc/
+lib/qt4/mkspecs/unsupported/qnx-armv7le-qcc/qmake.conf
+lib/qt4/mkspecs/unsupported/qnx-armv7le-qcc/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/qnx-x86-qcc/
+lib/qt4/mkspecs/unsupported/qnx-x86-qcc/qmake.conf
+lib/qt4/mkspecs/unsupported/qnx-x86-qcc/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/qws/
+lib/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/
+lib/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qmake.conf
+lib/qt4/mkspecs/unsupported/qws/integrity-x86-cx86/qplatformdefs.h
+lib/qt4/mkspecs/unsupported/qws/linux-x86-openkode-g++/
+lib/qt4/mkspecs/unsupported/qws/linux-x86-openkode-g++/qmake.conf
+lib/qt4/mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
 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
-lib/qt4/mkspecs/unsupported/qws/qnx-i386-g++/
-lib/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
-lib/qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
-lib/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/
-lib/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
-lib/qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
 lib/qt4/mkspecs/unsupported/vxworks-ppc-dcc/
 lib/qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
 lib/qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
@ -3523,6 +3825,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++-4.6-cross/
+lib/qt4/mkspecs/unsupported/win32-g++-4.6-cross/qmake.conf
+lib/qt4/mkspecs/unsupported/win32-g++-4.6-cross/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
@ -3530,6 +3835,9 @@ lib/qt4/mkspecs/win32-borland/
 lib/qt4/mkspecs/win32-borland/qmake.conf
 lib/qt4/mkspecs/win32-borland/qplatformdefs.h
 lib/qt4/mkspecs/win32-g++/
+lib/qt4/mkspecs/win32-g++-4.6/
+lib/qt4/mkspecs/win32-g++-4.6/qmake.conf
+lib/qt4/mkspecs/win32-g++-4.6/qplatformdefs.h
 lib/qt4/mkspecs/win32-g++/qmake.conf
 lib/qt4/mkspecs/win32-g++/qplatformdefs.h
 lib/qt4/mkspecs/win32-icc/
@ -3589,6 +3897,14 @@ lib/qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
 lib/qt4/mkspecs/wince60standard-x86-msvc2005/
 lib/qt4/mkspecs/wince60standard-x86-msvc2005/qmake.conf
 lib/qt4/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
+lib/qt4/mkspecs/wince70embedded-armv4i-msvc2008/
+lib/qt4/mkspecs/wince70embedded-armv4i-msvc2008/default_post.prf
+lib/qt4/mkspecs/wince70embedded-armv4i-msvc2008/qmake.conf
+lib/qt4/mkspecs/wince70embedded-armv4i-msvc2008/qplatformdefs.h
+lib/qt4/mkspecs/wince70embedded-x86-msvc2008/
+lib/qt4/mkspecs/wince70embedded-x86-msvc2008/default_post.prf
+lib/qt4/mkspecs/wince70embedded-x86-msvc2008/qmake.conf
+lib/qt4/mkspecs/wince70embedded-x86-msvc2008/qplatformdefs.h
 lib/qt4/mkspecs/wincewm50pocket-msvc2005/
 lib/qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf
 lib/qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
@ -3662,22 +3978,77 @@ lib/qt4/pkgconfig/QtSql.pc
 lib/qt4/pkgconfig/QtSvg.pc
 lib/qt4/pkgconfig/QtTest.pc
 lib/qt4/pkgconfig/QtUiTools.pc
+lib/qt4/pkgconfig/QtWebKit.pc
 lib/qt4/pkgconfig/QtXml.pc
 lib/qt4/pkgconfig/QtXmlPatterns.pc
 lib/qt4/pkgconfig/phonon.pc
 lib/qt4/plugins/
 lib/qt4/plugins/accessible/
+lib/qt4/plugins/accessible/libqtaccessiblecompatwidgets.so
+lib/qt4/plugins/accessible/libqtaccessiblewidgets.so
 lib/qt4/plugins/bearer/
+lib/qt4/plugins/bearer/libqgenericbearer.so
+lib/qt4/plugins/codecs/
+lib/qt4/plugins/codecs/libqcncodecs.so
+lib/qt4/plugins/codecs/libqjpcodecs.so
+lib/qt4/plugins/codecs/libqkrcodecs.so
+lib/qt4/plugins/codecs/libqtwcodecs.so
 lib/qt4/plugins/designer/
+lib/qt4/plugins/designer/libphononwidgets.so
+lib/qt4/plugins/designer/libqdeclarativeview.so
+lib/qt4/plugins/designer/libqt3supportwidgets.so
+lib/qt4/plugins/designer/libqwebview.so
 lib/qt4/plugins/graphicssystems/
+lib/qt4/plugins/graphicssystems/libqglgraphicssystem.so
+lib/qt4/plugins/graphicssystems/libqtracegraphicssystem.so
 lib/qt4/plugins/iconengines/
+lib/qt4/plugins/iconengines/libqsvgicon.so
 lib/qt4/plugins/imageformats/
+lib/qt4/plugins/imageformats/libqgif.so
+lib/qt4/plugins/imageformats/libqico.so
+lib/qt4/plugins/imageformats/libqjpeg.so
+lib/qt4/plugins/imageformats/libqmng.so
+lib/qt4/plugins/imageformats/libqsvg.so
+lib/qt4/plugins/imageformats/libqtga.so
+lib/qt4/plugins/imageformats/libqtiff.so
 lib/qt4/plugins/inputmethods/
+lib/qt4/plugins/inputmethods/libqimsw-multi.so
 lib/qt4/plugins/phonon_backend/
+lib/qt4/plugins/phonon_backend/libphonon_gstreamer.so
 lib/qt4/plugins/qmltooling/
+lib/qt4/plugins/qmltooling/libqmldbg_inspector.so
+lib/qt4/plugins/qmltooling/libqmldbg_tcp.so
 lib/qt4/plugins/script/
+lib/qt4/plugins/script/libqtscriptdbus.so
 lib/qt4/plugins/sqldrivers/
+lib/qt4/plugins/sqldrivers/libqsqlite.so
 lib/qt4/q3porting.xml
+lib/qt4/tests/
+lib/qt4/tests/qt4/
+lib/qt4/tests/qt4/tst_hybridPixmap/
+@bin lib/qt4/tests/qt4/tst_hybridPixmap/hybridPixmap
+lib/qt4/tests/qt4/tst_loading/
+@bin lib/qt4/tests/qt4/tst_loading/tst_loading
+lib/qt4/tests/qt4/tst_painting/
+@bin lib/qt4/tests/qt4/tst_painting/tst_painting
+lib/qt4/tests/qt4/tst_qdeclarativewebview/
+@bin lib/qt4/tests/qt4/tst_qdeclarativewebview/tst_qdeclarativewebview
+lib/qt4/tests/qt4/tst_qgraphicswebview/
+@bin lib/qt4/tests/qt4/tst_qgraphicswebview/tst_qgraphicswebview
+lib/qt4/tests/qt4/tst_qwebelement/
+@bin lib/qt4/tests/qt4/tst_qwebelement/tst_qwebelement
+lib/qt4/tests/qt4/tst_qwebframe/
+@bin lib/qt4/tests/qt4/tst_qwebframe/tst_qwebframe
+lib/qt4/tests/qt4/tst_qwebhistory/
+@bin lib/qt4/tests/qt4/tst_qwebhistory/tst_qwebhistory
+lib/qt4/tests/qt4/tst_qwebhistoryinterface/
+@bin lib/qt4/tests/qt4/tst_qwebhistoryinterface/tst_qwebhistoryinterface
+lib/qt4/tests/qt4/tst_qwebinspector/
+@bin lib/qt4/tests/qt4/tst_qwebinspector/tst_qwebinspector
+lib/qt4/tests/qt4/tst_qwebpage/
+@bin lib/qt4/tests/qt4/tst_qwebpage/tst_qwebpage
+lib/qt4/tests/qt4/tst_qwebview/
+@bin lib/qt4/tests/qt4/tst_qwebview/tst_qwebview
 lib/qt4/translations/
 lib/qt4/translations/assistant_cs.qm
 lib/qt4/translations/assistant_da.qm
@ -3742,6 +4113,7 @@ lib/qt4/translations/qt_help_zh_TW.qm
 lib/qt4/translations/qt_hu.qm
 lib/qt4/translations/qt_ja.qm
 lib/qt4/translations/qt_ko.qm
+lib/qt4/translations/qt_lt.qm
 lib/qt4/translations/qt_pl.qm
 lib/qt4/translations/qt_pt.qm
 lib/qt4/translations/qt_ru.qm
--- a/x11/qt4/pkg/PLIST-mysql
+++ b/x11/qt4/pkg/PLIST-mysql
@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-mysql,v 1.1.1.1 2005/07/04 11:10:13 espie Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST-mysql,v 1.2 2012/06/14 09:38:36 espie Exp $
+lib/qt4/plugins/sqldrivers/libqsqlmysql.so
--- a/x11/qt4/pkg/PLIST-postgresql
+++ b/x11/qt4/pkg/PLIST-postgresql
@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-postgresql,v 1.1.1.1 2005/07/04 11:10:13 espie Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST-postgresql,v 1.2 2012/06/14 09:38:36 espie Exp $
+lib/qt4/plugins/sqldrivers/libqsqlpsql.so
--- a/x11/qt4/pkg/PLIST-sqlite
+++ b/x11/qt4/pkg/PLIST-sqlite
@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-sqlite,v 1.1 2006/05/15 21:09:39 espie Exp $
-%%SHARED%%
--- a/x11/qt4/pkg/PLIST-sqlite2
+++ b/x11/qt4/pkg/PLIST-sqlite2
@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-sqlite2,v 1.1 2006/05/15 21:09:39 espie Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST-sqlite2,v 1.2 2012/06/14 09:38:36 espie Exp $
+lib/qt4/plugins/sqldrivers/libqsqlite2.so
--- a/x11/qt4/pkg/PLIST-tds
+++ b/x11/qt4/pkg/PLIST-tds
@ -1,2 +1,2 @@
-@comment $OpenBSD: PLIST-tds,v 1.1 2009/04/18 17:25:43 espie Exp $
-%%SHARED%%
+@comment $OpenBSD: PLIST-tds,v 1.2 2012/06/14 09:38:36 espie Exp $
+lib/qt4/plugins/sqldrivers/libqsqltds.so