3 files changed, 287 insertions, 17 deletions

diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index f2ef6a434633..057936b982ad 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	gui
 PORTVERSION=	${QT4_VERSION}
-PORTREVISION=	0
 CATEGORIES?=	x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
@@ -37,21 +36,25 @@ MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
 		PATH=${WRKSRC}/bin:$$PATH
 
 DO_NOT_EXTRACT=	demos doc examples mkspecs qmake tools translations \
-		src/dbus src/network src/opengl src/phonon \
-		src/qt3support src/script src/sql src/svg src/testlib \
-		src/tools src/xml src/xmlpatterns src/3rdparty/clucene \
-		src/3rdparty/kdebase src/3rdparty/kdelibs src/3rdparty/webkit
+		src/activeqt src/dbus src/multimedia src/network src/opengl \
+		src/openvg src/phonon src/qt3support src/s60installs \
+		src/s60main src/script src/scripttools src/sql src/svg \
+		src/testlib src/tools src/winmain src/xml src/xmlpatterns \
+		src/3rdparty/clucene src/3rdparty/freetype \
+		src/3rdparty/libjpeg src/3rdparty/libmng src/3rdparty/libpng \
+		src/3rdparty/libtiff src/3rdparty/phonon src/3rdparty/webkit
 EXTRACT_AFTER_ARGS=	| ${TAR} -xf -
 .for dne in ${DO_NOT_EXTRACT}
 EXTRACT_AFTER_ARGS+=	--exclude '${DISTNAME}/${dne}'
 .endfor
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src/${PORTNAME}
-CONFIGURE_WRKSRC=${WRKSRC}/../../
-PATCH_WRKSRC=${CONFIGURE_WRKSRC}
+BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
 CONFIGURE_ARGS+=	-I../../include/Qt -I../../include
 
+EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
+
 FONTSCALE=	${LOCALBASE}/lib/X11/fonts/TTF/luximb.ttf
 FONTENCOD=	${LOCALBASE}/lib/X11/fonts/encodings/encodings.dir
 
@@ -82,19 +85,18 @@ RUN_DEPENDS+=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
 .endif
 
 pre-configure:
-	${CP} ${.CURDIR}/../../devel/qt4/files/configure ${CONFIGURE_WRKSRC}
-	${MKDIR} ${WRKSRC}/../../mkspecs
-	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake
-	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
-	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/../../bin/rcc
-	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/../../bin/uic
+	${MKDIR} ${WRKSRC}/mkspecs
+	${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
+	${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/bin/moc
+	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
+	${LN} -sf ${LOCALBASE}/bin/uic-qt4 ${WRKSRC}/bin/uic
 
 post-configure:
 	${REINPLACE_CMD} -e 's|${PREFIX}/lib/qt4/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
-		-e 's|.*$$(QMAKE).*||g' ${WRKSRC}/Makefile
+		-e 's|.*$$(QMAKE).*||g' ${BUILD_WRKSRC}/Makefile
 	${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
 			-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
 			-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
-		${WRKSRC}/../../lib/pkgconfig/QtGui.pc
+		${WRKSRC}/lib/pkgconfig/QtGui.pc
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/qt4-gui/pkg-descr b/x11-toolkits/qt4-gui/pkg-descr
index efc79b9aaf24..36bc69717e98 100644
--- a/x11-toolkits/qt4-gui/pkg-descr
+++ b/x11-toolkits/qt4-gui/pkg-descr
@@ -9,4 +9,4 @@ the application programmer with a single, common API for all operating systems.
 The native C APIs are encapsulated in a set of well-designed, fully
 object-oriented C++ classes. 
 
-WWW: http://www.trolltech.com/products/qt/index.html
+WWW: http://qt.nokia.com/products/qt/index.html
diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist
index 613cdd5ca955..a2bac7ea6233 100644
--- a/x11-toolkits/qt4-gui/pkg-plist
+++ b/x11-toolkits/qt4-gui/pkg-plist
@@ -1,5 +1,6 @@
 include/qt4/Qt/QtGui
 include/qt4/Qt/qabstractbutton.h
+include/qt4/Qt/qabstractfontengine_qws.h
 include/qt4/Qt/qabstractitemdelegate.h
 include/qt4/Qt/qabstractitemview.h
 include/qt4/Qt/qabstractpagesetupdialog.h
@@ -35,14 +36,22 @@ include/qt4/Qt/qcombobox.h
 include/qt4/Qt/qcommandlinkbutton.h
 include/qt4/Qt/qcommonstyle.h
 include/qt4/Qt/qcompleter.h
+include/qt4/Qt/qcopchannel_qws.h
 include/qt4/Qt/qcursor.h
 include/qt4/Qt/qdatawidgetmapper.h
 include/qt4/Qt/qdatetimeedit.h
+include/qt4/Qt/qdecoration_qws.h
+include/qt4/Qt/qdecorationdefault_qws.h
+include/qt4/Qt/qdecorationfactory_qws.h
+include/qt4/Qt/qdecorationplugin_qws.h
+include/qt4/Qt/qdecorationstyled_qws.h
+include/qt4/Qt/qdecorationwindows_qws.h
 include/qt4/Qt/qdesktopservices.h
 include/qt4/Qt/qdesktopwidget.h
 include/qt4/Qt/qdial.h
 include/qt4/Qt/qdialog.h
 include/qt4/Qt/qdialogbuttonbox.h
+include/qt4/Qt/qdirectpainter_qws.h
 include/qt4/Qt/qdirmodel.h
 include/qt4/Qt/qdockwidget.h
 include/qt4/Qt/qdrag.h
@@ -61,6 +70,11 @@ include/qt4/Qt/qfontinfo.h
 include/qt4/Qt/qfontmetrics.h
 include/qt4/Qt/qformlayout.h
 include/qt4/Qt/qframe.h
+include/qt4/Qt/qgenericmatrix.h
+include/qt4/Qt/qgesture.h
+include/qt4/Qt/qgesturerecognizer.h
+include/qt4/Qt/qgraphicsanchorlayout.h
+include/qt4/Qt/qgraphicseffect.h
 include/qt4/Qt/qgraphicsgridlayout.h
 include/qt4/Qt/qgraphicsitem.h
 include/qt4/Qt/qgraphicsitemanimation.h
@@ -70,11 +84,13 @@ include/qt4/Qt/qgraphicslinearlayout.h
 include/qt4/Qt/qgraphicsproxywidget.h
 include/qt4/Qt/qgraphicsscene.h
 include/qt4/Qt/qgraphicssceneevent.h
+include/qt4/Qt/qgraphicstransform.h
 include/qt4/Qt/qgraphicsview.h
 include/qt4/Qt/qgraphicswidget.h
 include/qt4/Qt/qgridlayout.h
 include/qt4/Qt/qgroupbox.h
 include/qt4/Qt/qgtkstyle.h
+include/qt4/Qt/qguifunctions_wince.h
 include/qt4/Qt/qheaderview.h
 include/qt4/Qt/qicon.h
 include/qt4/Qt/qiconengine.h
@@ -90,6 +106,15 @@ include/qt4/Qt/qinputdialog.h
 include/qt4/Qt/qitemdelegate.h
 include/qt4/Qt/qitemeditorfactory.h
 include/qt4/Qt/qitemselectionmodel.h
+include/qt4/Qt/qkbd_qws.h
+include/qt4/Qt/qkbddriverfactory_qws.h
+include/qt4/Qt/qkbddriverplugin_qws.h
+include/qt4/Qt/qkbdlinuxinput_qws.h
+include/qt4/Qt/qkbdqnx_qws.h
+include/qt4/Qt/qkbdtty_qws.h
+include/qt4/Qt/qkbdum_qws.h
+include/qt4/Qt/qkbdvfb_qws.h
+include/qt4/Qt/qkeyeventtransition.h
 include/qt4/Qt/qkeysequence.h
 include/qt4/Qt/qlabel.h
 include/qt4/Qt/qlayout.h
@@ -98,8 +123,13 @@ include/qt4/Qt/qlcdnumber.h
 include/qt4/Qt/qlineedit.h
 include/qt4/Qt/qlistview.h
 include/qt4/Qt/qlistwidget.h
+include/qt4/Qt/qmaccocoaviewcontainer_mac.h
+include/qt4/Qt/qmacdefines_mac.h
+include/qt4/Qt/qmacnativewidget_mac.h
+include/qt4/Qt/qmacstyle_mac.h
 include/qt4/Qt/qmainwindow.h
 include/qt4/Qt/qmatrix.h
+include/qt4/Qt/qmatrix4x4.h
 include/qt4/Qt/qmdiarea.h
 include/qt4/Qt/qmdisubwindow.h
 include/qt4/Qt/qmenu.h
@@ -108,6 +138,16 @@ include/qt4/Qt/qmenudata.h
 include/qt4/Qt/qmessagebox.h
 include/qt4/Qt/qmime.h
 include/qt4/Qt/qmotifstyle.h
+include/qt4/Qt/qmouse_qws.h
+include/qt4/Qt/qmousedriverfactory_qws.h
+include/qt4/Qt/qmousedriverplugin_qws.h
+include/qt4/Qt/qmouseeventtransition.h
+include/qt4/Qt/qmouselinuxinput_qws.h
+include/qt4/Qt/qmouselinuxtp_qws.h
+include/qt4/Qt/qmousepc_qws.h
+include/qt4/Qt/qmouseqnx_qws.h
+include/qt4/Qt/qmousetslib_qws.h
+include/qt4/Qt/qmousevfb_qws.h
 include/qt4/Qt/qmovie.h
 include/qt4/Qt/qpagesetupdialog.h
 include/qt4/Qt/qpaintdevice.h
@@ -132,11 +172,25 @@ include/qt4/Qt/qprintpreviewwidget.h
 include/qt4/Qt/qprogressbar.h
 include/qt4/Qt/qprogressdialog.h
 include/qt4/Qt/qproxymodel.h
+include/qt4/Qt/qproxystyle.h
 include/qt4/Qt/qpushbutton.h
+include/qt4/Qt/qquaternion.h
 include/qt4/Qt/qradiobutton.h
 include/qt4/Qt/qregion.h
 include/qt4/Qt/qrgb.h
 include/qt4/Qt/qrubberband.h
+include/qt4/Qt/qs60mainapplication.h
+include/qt4/Qt/qs60mainappui.h
+include/qt4/Qt/qs60maindocument.h
+include/qt4/Qt/qs60style.h
+include/qt4/Qt/qscreen_qws.h
+include/qt4/Qt/qscreendriverfactory_qws.h
+include/qt4/Qt/qscreendriverplugin_qws.h
+include/qt4/Qt/qscreenlinuxfb_qws.h
+include/qt4/Qt/qscreenproxy_qws.h
+include/qt4/Qt/qscreenqnx_qws.h
+include/qt4/Qt/qscreentransformed_qws.h
+include/qt4/Qt/qscreenvfb_qws.h
 include/qt4/Qt/qscrollarea.h
 include/qt4/Qt/qscrollbar.h
 include/qt4/Qt/qsessionmanager.h
@@ -146,6 +200,7 @@ include/qt4/Qt/qsizepolicy.h
 include/qt4/Qt/qslider.h
 include/qt4/Qt/qsortfilterproxymodel.h
 include/qt4/Qt/qsound.h
+include/qt4/Qt/qsoundqss_qws.h
 include/qt4/Qt/qspinbox.h
 include/qt4/Qt/qsplashscreen.h
 include/qt4/Qt/qsplitter.h
@@ -160,6 +215,7 @@ include/qt4/Qt/qstylefactory.h
 include/qt4/Qt/qstyleoption.h
 include/qt4/Qt/qstylepainter.h
 include/qt4/Qt/qstyleplugin.h
+include/qt4/Qt/qsymbianevent.h
 include/qt4/Qt/qsyntaxhighlighter.h
 include/qt4/Qt/qsystemtrayicon.h
 include/qt4/Qt/qtabbar.h
@@ -183,6 +239,8 @@ include/qt4/Qt/qtoolbox.h
 include/qt4/Qt/qtoolbutton.h
 include/qt4/Qt/qtooltip.h
 include/qt4/Qt/qtransform.h
+include/qt4/Qt/qtransportauth_qws.h
+include/qt4/Qt/qtransportauthdefs_qws.h
 include/qt4/Qt/qtreeview.h
 include/qt4/Qt/qtreewidget.h
 include/qt4/Qt/qtreewidgetitemiterator.h
@@ -190,21 +248,37 @@ include/qt4/Qt/qundogroup.h
 include/qt4/Qt/qundostack.h
 include/qt4/Qt/qundoview.h
 include/qt4/Qt/qvalidator.h
+include/qt4/Qt/qvector2d.h
+include/qt4/Qt/qvector3d.h
+include/qt4/Qt/qvector4d.h
+include/qt4/Qt/qvfbhdr.h
 include/qt4/Qt/qwhatsthis.h
 include/qt4/Qt/qwidget.h
 include/qt4/Qt/qwidgetaction.h
 include/qt4/Qt/qwindowdefs.h
+include/qt4/Qt/qwindowdefs_win.h
 include/qt4/Qt/qwindowscestyle.h
 include/qt4/Qt/qwindowsmobilestyle.h
 include/qt4/Qt/qwindowsstyle.h
 include/qt4/Qt/qwindowsvistastyle.h
 include/qt4/Qt/qwindowsxpstyle.h
+include/qt4/Qt/qwindowsystem_qws.h
 include/qt4/Qt/qwizard.h
 include/qt4/Qt/qwmatrix.h
 include/qt4/Qt/qworkspace.h
+include/qt4/Qt/qwscursor_qws.h
+include/qt4/Qt/qwsdisplay_qws.h
+include/qt4/Qt/qwsembedwidget.h
+include/qt4/Qt/qwsevent_qws.h
+include/qt4/Qt/qwsmanager_qws.h
+include/qt4/Qt/qwsproperty_qws.h
+include/qt4/Qt/qwsprotocolitem_qws.h
+include/qt4/Qt/qwssocket_qws.h
+include/qt4/Qt/qwsutils_qws.h
 include/qt4/Qt/qx11embed_x11.h
 include/qt4/Qt/qx11info_x11.h
 include/qt4/QtGui/QAbstractButton
+include/qt4/QtGui/QAbstractFontEngine
 include/qt4/QtGui/QAbstractGraphicsShapeItem
 include/qt4/QtGui/QAbstractItemDelegate
 include/qt4/QtGui/QAbstractItemView
@@ -218,6 +292,7 @@ include/qt4/QtGui/QAbstractTextDocumentLayout
 include/qt4/QtGui/QAbstractUndoItem
 include/qt4/QtGui/QAccessible
 include/qt4/QtGui/QAccessible2Interface
+include/qt4/QtGui/QAccessibleActionInterface
 include/qt4/QtGui/QAccessibleApplication
 include/qt4/QtGui/QAccessibleBridge
 include/qt4/QtGui/QAccessibleBridgeFactoryInterface
@@ -225,6 +300,7 @@ include/qt4/QtGui/QAccessibleBridgePlugin
 include/qt4/QtGui/QAccessibleEditableTextInterface
 include/qt4/QtGui/QAccessibleEvent
 include/qt4/QtGui/QAccessibleFactoryInterface
+include/qt4/QtGui/QAccessibleImageInterface
 include/qt4/QtGui/QAccessibleInterface
 include/qt4/QtGui/QAccessibleInterfaceEx
 include/qt4/QtGui/QAccessibleObject
@@ -240,6 +316,7 @@ include/qt4/QtGui/QAction
 include/qt4/QtGui/QActionEvent
 include/qt4/QtGui/QActionGroup
 include/qt4/QtGui/QApplication
+include/qt4/QtGui/QAuthDevice
 include/qt4/QtGui/QBitmap
 include/qt4/QtGui/QBoxLayout
 include/qt4/QtGui/QBrush
@@ -263,17 +340,27 @@ include/qt4/QtGui/QCommonStyle
 include/qt4/QtGui/QCompleter
 include/qt4/QtGui/QConicalGradient
 include/qt4/QtGui/QContextMenuEvent
+include/qt4/QtGui/QCopChannel
 include/qt4/QtGui/QCursor
 include/qt4/QtGui/QCursorShape
 include/qt4/QtGui/QDataWidgetMapper
 include/qt4/QtGui/QDateEdit
 include/qt4/QtGui/QDateTimeEdit
+include/qt4/QtGui/QDecoration
+include/qt4/QtGui/QDecorationAction
+include/qt4/QtGui/QDecorationDefault
+include/qt4/QtGui/QDecorationFactory
+include/qt4/QtGui/QDecorationFactoryInterface
+include/qt4/QtGui/QDecorationPlugin
+include/qt4/QtGui/QDecorationStyled
+include/qt4/QtGui/QDecorationWindows
 include/qt4/QtGui/QDesktopServices
 include/qt4/QtGui/QDesktopWidget
 include/qt4/QtGui/QDial
 include/qt4/QtGui/QDialog
 include/qt4/QtGui/QDialogButtonBox
 include/qt4/QtGui/QDirModel
+include/qt4/QtGui/QDirectPainter
 include/qt4/QtGui/QDockWidget
 include/qt4/QtGui/QDoubleSpinBox
 include/qt4/QtGui/QDoubleValidator
@@ -294,14 +381,27 @@ include/qt4/QtGui/QFont
 include/qt4/QtGui/QFontComboBox
 include/qt4/QtGui/QFontDatabase
 include/qt4/QtGui/QFontDialog
+include/qt4/QtGui/QFontEngineFactoryInterface
+include/qt4/QtGui/QFontEngineInfo
+include/qt4/QtGui/QFontEnginePlugin
 include/qt4/QtGui/QFontInfo
 include/qt4/QtGui/QFontMetrics
 include/qt4/QtGui/QFontMetricsF
 include/qt4/QtGui/QFormLayout
 include/qt4/QtGui/QFrame
+include/qt4/QtGui/QGenericMatrix
+include/qt4/QtGui/QGesture
+include/qt4/QtGui/QGestureEvent
+include/qt4/QtGui/QGestureRecognizer
 include/qt4/QtGui/QGradient
 include/qt4/QtGui/QGradientStop
 include/qt4/QtGui/QGradientStops
+include/qt4/QtGui/QGraphicsAnchor
+include/qt4/QtGui/QGraphicsAnchorLayout
+include/qt4/QtGui/QGraphicsBlurEffect
+include/qt4/QtGui/QGraphicsColorizeEffect
+include/qt4/QtGui/QGraphicsDropShadowEffect
+include/qt4/QtGui/QGraphicsEffect
 include/qt4/QtGui/QGraphicsEllipseItem
 include/qt4/QtGui/QGraphicsGridLayout
 include/qt4/QtGui/QGraphicsItem
@@ -311,11 +411,15 @@ include/qt4/QtGui/QGraphicsLayout
 include/qt4/QtGui/QGraphicsLayoutItem
 include/qt4/QtGui/QGraphicsLineItem
 include/qt4/QtGui/QGraphicsLinearLayout
+include/qt4/QtGui/QGraphicsObject
+include/qt4/QtGui/QGraphicsOpacityEffect
 include/qt4/QtGui/QGraphicsPathItem
 include/qt4/QtGui/QGraphicsPixmapItem
 include/qt4/QtGui/QGraphicsPolygonItem
 include/qt4/QtGui/QGraphicsProxyWidget
 include/qt4/QtGui/QGraphicsRectItem
+include/qt4/QtGui/QGraphicsRotation
+include/qt4/QtGui/QGraphicsScale
 include/qt4/QtGui/QGraphicsScene
 include/qt4/QtGui/QGraphicsSceneContextMenuEvent
 include/qt4/QtGui/QGraphicsSceneDragDropEvent
@@ -328,6 +432,7 @@ include/qt4/QtGui/QGraphicsSceneResizeEvent
 include/qt4/QtGui/QGraphicsSceneWheelEvent
 include/qt4/QtGui/QGraphicsSimpleTextItem
 include/qt4/QtGui/QGraphicsTextItem
+include/qt4/QtGui/QGraphicsTransform
 include/qt4/QtGui/QGraphicsView
 include/qt4/QtGui/QGraphicsWidget
 include/qt4/QtGui/QGridLayout
@@ -369,7 +474,10 @@ include/qt4/QtGui/QItemEditorFactory
 include/qt4/QtGui/QItemSelection
 include/qt4/QtGui/QItemSelectionModel
 include/qt4/QtGui/QItemSelectionRange
+include/qt4/QtGui/QKbdDriverFactory
+include/qt4/QtGui/QKbdDriverPlugin
 include/qt4/QtGui/QKeyEvent
+include/qt4/QtGui/QKeyEventTransition
 include/qt4/QtGui/QKeySequence
 include/qt4/QtGui/QLCDNumber
 include/qt4/QtGui/QLabel
@@ -378,13 +486,27 @@ include/qt4/QtGui/QLayoutItem
 include/qt4/QtGui/QLayoutIterator
 include/qt4/QtGui/QLineEdit
 include/qt4/QtGui/QLinearGradient
+include/qt4/QtGui/QLinuxFbScreen
+include/qt4/QtGui/QLinuxFb_Shared
 include/qt4/QtGui/QListView
 include/qt4/QtGui/QListWidget
 include/qt4/QtGui/QListWidgetItem
+include/qt4/QtGui/QMacCocoaViewContainer
 include/qt4/QtGui/QMacMime
+include/qt4/QtGui/QMacNativeWidget
 include/qt4/QtGui/QMacPasteboardMime
+include/qt4/QtGui/QMacStyle
 include/qt4/QtGui/QMainWindow
 include/qt4/QtGui/QMatrix
+include/qt4/QtGui/QMatrix2x2
+include/qt4/QtGui/QMatrix2x3
+include/qt4/QtGui/QMatrix2x4
+include/qt4/QtGui/QMatrix3x2
+include/qt4/QtGui/QMatrix3x3
+include/qt4/QtGui/QMatrix3x4
+include/qt4/QtGui/QMatrix4x2
+include/qt4/QtGui/QMatrix4x3
+include/qt4/QtGui/QMatrix4x4
 include/qt4/QtGui/QMdiArea
 include/qt4/QtGui/QMdiSubWindow
 include/qt4/QtGui/QMenu
@@ -394,7 +516,10 @@ include/qt4/QtGui/QMenubarUpdatedEvent
 include/qt4/QtGui/QMessageBox
 include/qt4/QtGui/QMimeSource
 include/qt4/QtGui/QMotifStyle
+include/qt4/QtGui/QMouseDriverFactory
+include/qt4/QtGui/QMouseDriverPlugin
 include/qt4/QtGui/QMouseEvent
+include/qt4/QtGui/QMouseEventTransition
 include/qt4/QtGui/QMoveEvent
 include/qt4/QtGui/QMovie
 include/qt4/QtGui/QPageSetupDialog
@@ -407,11 +532,13 @@ include/qt4/QtGui/QPainterPath
 include/qt4/QtGui/QPainterPathPrivate
 include/qt4/QtGui/QPainterPathStroker
 include/qt4/QtGui/QPalette
+include/qt4/QtGui/QPanGesture
 include/qt4/QtGui/QPen
 include/qt4/QtGui/QPicture
 include/qt4/QtGui/QPictureFormatInterface
 include/qt4/QtGui/QPictureFormatPlugin
 include/qt4/QtGui/QPictureIO
+include/qt4/QtGui/QPinchGesture
 include/qt4/QtGui/QPixmap
 include/qt4/QtGui/QPixmapCache
 include/qt4/QtGui/QPlainTextDocumentLayout
@@ -419,6 +546,7 @@ include/qt4/QtGui/QPlainTextEdit
 include/qt4/QtGui/QPlastiqueStyle
 include/qt4/QtGui/QPolygon
 include/qt4/QtGui/QPolygonF
+include/qt4/QtGui/QPoolEntry
 include/qt4/QtGui/QPrintDialog
 include/qt4/QtGui/QPrintEngine
 include/qt4/QtGui/QPrintPreviewDialog
@@ -428,7 +556,13 @@ include/qt4/QtGui/QPrinterInfo
 include/qt4/QtGui/QProgressBar
 include/qt4/QtGui/QProgressDialog
 include/qt4/QtGui/QProxyModel
+include/qt4/QtGui/QProxyScreen
+include/qt4/QtGui/QProxyScreenCursor
+include/qt4/QtGui/QProxyStyle
 include/qt4/QtGui/QPushButton
+include/qt4/QtGui/QQnxMouseHandler
+include/qt4/QtGui/QQnxScreen
+include/qt4/QtGui/QQuaternion
 include/qt4/QtGui/QRadialGradient
 include/qt4/QtGui/QRadioButton
 include/qt4/QtGui/QRegExpValidator
@@ -436,6 +570,15 @@ include/qt4/QtGui/QRegion
 include/qt4/QtGui/QResizeEvent
 include/qt4/QtGui/QRgb
 include/qt4/QtGui/QRubberBand
+include/qt4/QtGui/QS60MainAppUi
+include/qt4/QtGui/QS60MainApplication
+include/qt4/QtGui/QS60MainDocument
+include/qt4/QtGui/QS60Style
+include/qt4/QtGui/QScreen
+include/qt4/QtGui/QScreenCursor
+include/qt4/QtGui/QScreenDriverFactory
+include/qt4/QtGui/QScreenDriverFactoryInterface
+include/qt4/QtGui/QScreenDriverPlugin
 include/qt4/QtGui/QScrollArea
 include/qt4/QtGui/QScrollBar
 include/qt4/QtGui/QSessionManager
@@ -495,6 +638,7 @@ include/qt4/QtGui/QStyleOptionTabBarBaseV2
 include/qt4/QtGui/QStyleOptionTabV2
 include/qt4/QtGui/QStyleOptionTabV3
 include/qt4/QtGui/QStyleOptionTabWidgetFrame
+include/qt4/QtGui/QStyleOptionTabWidgetFrameV2
 include/qt4/QtGui/QStyleOptionTitleBar
 include/qt4/QtGui/QStyleOptionToolBar
 include/qt4/QtGui/QStyleOptionToolBox
@@ -507,6 +651,8 @@ include/qt4/QtGui/QStyleOptionViewItemV4
 include/qt4/QtGui/QStylePainter
 include/qt4/QtGui/QStylePlugin
 include/qt4/QtGui/QStyledItemDelegate
+include/qt4/QtGui/QSwipeGesture
+include/qt4/QtGui/QSymbianEvent
 include/qt4/QtGui/QSyntaxHighlighter
 include/qt4/QtGui/QSystemTrayIcon
 include/qt4/QtGui/QTabBar
@@ -516,6 +662,8 @@ include/qt4/QtGui/QTableWidget
 include/qt4/QtGui/QTableWidgetItem
 include/qt4/QtGui/QTableWidgetSelectionRange
 include/qt4/QtGui/QTabletEvent
+include/qt4/QtGui/QTapGesture
+include/qt4/QtGui/QTapAndHoldGesture
 include/qt4/QtGui/QTextBlock
 include/qt4/QtGui/QTextBlockFormat
 include/qt4/QtGui/QTextBlockGroup
@@ -547,13 +695,17 @@ include/qt4/QtGui/QTextTable
 include/qt4/QtGui/QTextTableCell
 include/qt4/QtGui/QTextTableCellFormat
 include/qt4/QtGui/QTextTableFormat
+include/qt4/QtGui/QTileRules
 include/qt4/QtGui/QTimeEdit
 include/qt4/QtGui/QToolBar
 include/qt4/QtGui/QToolBarChangeEvent
 include/qt4/QtGui/QToolBox
 include/qt4/QtGui/QToolButton
 include/qt4/QtGui/QToolTip
+include/qt4/QtGui/QTouchEvent
 include/qt4/QtGui/QTransform
+include/qt4/QtGui/QTransformedScreen
+include/qt4/QtGui/QTransportAuth
 include/qt4/QtGui/QTreeView
 include/qt4/QtGui/QTreeWidget
 include/qt4/QtGui/QTreeWidgetItem
@@ -565,8 +717,50 @@ include/qt4/QtGui/QUndoView
 include/qt4/QtGui/QUnixPrintWidget
 include/qt4/QtGui/QUpdateLaterEvent
 include/qt4/QtGui/QVBoxLayout
+include/qt4/QtGui/QVFbHeader
+include/qt4/QtGui/QVFbKeyData
+include/qt4/QtGui/QVFbKeyboardHandler
+include/qt4/QtGui/QVFbMouseHandler
+include/qt4/QtGui/QVFbScreen
 include/qt4/QtGui/QValidator
+include/qt4/QtGui/QVector2D
+include/qt4/QtGui/QVector3D
+include/qt4/QtGui/QVector4D
 include/qt4/QtGui/QWMatrix
+include/qt4/QtGui/QWSCalibratedMouseHandler
+include/qt4/QtGui/QWSClient
+include/qt4/QtGui/QWSCursor
+include/qt4/QtGui/QWSCursorMap
+include/qt4/QtGui/QWSDisplay
+include/qt4/QtGui/QWSEmbedWidget
+include/qt4/QtGui/QWSEvent
+include/qt4/QtGui/QWSInputMethod
+include/qt4/QtGui/QWSInternalWindowInfo
+include/qt4/QtGui/QWSKeyboardHandler
+include/qt4/QtGui/QWSKeyboardHandlerFactoryInterface
+include/qt4/QtGui/QWSLinuxInputKeyboardHandler
+include/qt4/QtGui/QWSLinuxInputMouseHandler
+include/qt4/QtGui/QWSLinuxTPMouseHandler
+include/qt4/QtGui/QWSManager
+include/qt4/QtGui/QWSMouseHandler
+include/qt4/QtGui/QWSMouseHandlerFactoryInterface
+include/qt4/QtGui/QWSPcMouseHandler
+include/qt4/QtGui/QWSPointerCalibrationData
+include/qt4/QtGui/QWSPropertyManager
+include/qt4/QtGui/QWSProtocolItem
+include/qt4/QtGui/QWSQnxKeyboardHandler
+include/qt4/QtGui/QWSScreenSaver
+include/qt4/QtGui/QWSServer
+include/qt4/QtGui/QWSServerSocket
+include/qt4/QtGui/QWSSocket
+include/qt4/QtGui/QWSSoundClient
+include/qt4/QtGui/QWSSoundServer
+include/qt4/QtGui/QWSSoundServerSocket
+include/qt4/QtGui/QWSTslibMouseHandler
+include/qt4/QtGui/QWSTtyKeyboardHandler
+include/qt4/QtGui/QWSUmKeyboardHandler
+include/qt4/QtGui/QWSWindow
+include/qt4/QtGui/QWSWindowInfo
 include/qt4/QtGui/QWhatsThis
 include/qt4/QtGui/QWhatsThisClickedEvent
 include/qt4/QtGui/QWheelEvent
@@ -594,6 +788,7 @@ include/qt4/QtGui/QX11Info
 include/qt4/QtGui/QtEvents
 include/qt4/QtGui/QtGui
 include/qt4/QtGui/qabstractbutton.h
+include/qt4/QtGui/qabstractfontengine_qws.h
 include/qt4/QtGui/qabstractitemdelegate.h
 include/qt4/QtGui/qabstractitemview.h
 include/qt4/QtGui/qabstractpagesetupdialog.h
@@ -629,14 +824,22 @@ include/qt4/QtGui/qcombobox.h
 include/qt4/QtGui/qcommandlinkbutton.h
 include/qt4/QtGui/qcommonstyle.h
 include/qt4/QtGui/qcompleter.h
+include/qt4/QtGui/qcopchannel_qws.h
 include/qt4/QtGui/qcursor.h
 include/qt4/QtGui/qdatawidgetmapper.h
 include/qt4/QtGui/qdatetimeedit.h
+include/qt4/QtGui/qdecoration_qws.h
+include/qt4/QtGui/qdecorationdefault_qws.h
+include/qt4/QtGui/qdecorationfactory_qws.h
+include/qt4/QtGui/qdecorationplugin_qws.h
+include/qt4/QtGui/qdecorationstyled_qws.h
+include/qt4/QtGui/qdecorationwindows_qws.h
 include/qt4/QtGui/qdesktopservices.h
 include/qt4/QtGui/qdesktopwidget.h
 include/qt4/QtGui/qdial.h
 include/qt4/QtGui/qdialog.h
 include/qt4/QtGui/qdialogbuttonbox.h
+include/qt4/QtGui/qdirectpainter_qws.h
 include/qt4/QtGui/qdirmodel.h
 include/qt4/QtGui/qdockwidget.h
 include/qt4/QtGui/qdrag.h
@@ -655,6 +858,11 @@ include/qt4/QtGui/qfontinfo.h
 include/qt4/QtGui/qfontmetrics.h
 include/qt4/QtGui/qformlayout.h
 include/qt4/QtGui/qframe.h
+include/qt4/QtGui/qgenericmatrix.h
+include/qt4/QtGui/qgesture.h
+include/qt4/QtGui/qgesturerecognizer.h
+include/qt4/QtGui/qgraphicsanchorlayout.h
+include/qt4/QtGui/qgraphicseffect.h
 include/qt4/QtGui/qgraphicsgridlayout.h
 include/qt4/QtGui/qgraphicsitem.h
 include/qt4/QtGui/qgraphicsitemanimation.h
@@ -664,11 +872,13 @@ include/qt4/QtGui/qgraphicslinearlayout.h
 include/qt4/QtGui/qgraphicsproxywidget.h
 include/qt4/QtGui/qgraphicsscene.h
 include/qt4/QtGui/qgraphicssceneevent.h
+include/qt4/QtGui/qgraphicstransform.h
 include/qt4/QtGui/qgraphicsview.h
 include/qt4/QtGui/qgraphicswidget.h
 include/qt4/QtGui/qgridlayout.h
 include/qt4/QtGui/qgroupbox.h
 include/qt4/QtGui/qgtkstyle.h
+include/qt4/QtGui/qguifunctions_wince.h
 include/qt4/QtGui/qheaderview.h
 include/qt4/QtGui/qicon.h
 include/qt4/QtGui/qiconengine.h
@@ -684,6 +894,15 @@ include/qt4/QtGui/qinputdialog.h
 include/qt4/QtGui/qitemdelegate.h
 include/qt4/QtGui/qitemeditorfactory.h
 include/qt4/QtGui/qitemselectionmodel.h
+include/qt4/QtGui/qkbd_qws.h
+include/qt4/QtGui/qkbddriverfactory_qws.h
+include/qt4/QtGui/qkbddriverplugin_qws.h
+include/qt4/QtGui/qkbdlinuxinput_qws.h
+include/qt4/QtGui/qkbdqnx_qws.h
+include/qt4/QtGui/qkbdtty_qws.h
+include/qt4/QtGui/qkbdum_qws.h
+include/qt4/QtGui/qkbdvfb_qws.h
+include/qt4/QtGui/qkeyeventtransition.h
 include/qt4/QtGui/qkeysequence.h
 include/qt4/QtGui/qlabel.h
 include/qt4/QtGui/qlayout.h
@@ -692,8 +911,13 @@ include/qt4/QtGui/qlcdnumber.h
 include/qt4/QtGui/qlineedit.h
 include/qt4/QtGui/qlistview.h
 include/qt4/QtGui/qlistwidget.h
+include/qt4/QtGui/qmaccocoaviewcontainer_mac.h
+include/qt4/QtGui/qmacdefines_mac.h
+include/qt4/QtGui/qmacnativewidget_mac.h
+include/qt4/QtGui/qmacstyle_mac.h
 include/qt4/QtGui/qmainwindow.h
 include/qt4/QtGui/qmatrix.h
+include/qt4/QtGui/qmatrix4x4.h
 include/qt4/QtGui/qmdiarea.h
 include/qt4/QtGui/qmdisubwindow.h
 include/qt4/QtGui/qmenu.h
@@ -702,6 +926,16 @@ include/qt4/QtGui/qmenudata.h
 include/qt4/QtGui/qmessagebox.h
 include/qt4/QtGui/qmime.h
 include/qt4/QtGui/qmotifstyle.h
+include/qt4/QtGui/qmouse_qws.h
+include/qt4/QtGui/qmousedriverfactory_qws.h
+include/qt4/QtGui/qmousedriverplugin_qws.h
+include/qt4/QtGui/qmouseeventtransition.h
+include/qt4/QtGui/qmouselinuxinput_qws.h
+include/qt4/QtGui/qmouselinuxtp_qws.h
+include/qt4/QtGui/qmousepc_qws.h
+include/qt4/QtGui/qmouseqnx_qws.h
+include/qt4/QtGui/qmousetslib_qws.h
+include/qt4/QtGui/qmousevfb_qws.h
 include/qt4/QtGui/qmovie.h
 include/qt4/QtGui/qpagesetupdialog.h
 include/qt4/QtGui/qpaintdevice.h
@@ -726,11 +960,25 @@ include/qt4/QtGui/qprintpreviewwidget.h
 include/qt4/QtGui/qprogressbar.h
 include/qt4/QtGui/qprogressdialog.h
 include/qt4/QtGui/qproxymodel.h
+include/qt4/QtGui/qproxystyle.h
 include/qt4/QtGui/qpushbutton.h
+include/qt4/QtGui/qquaternion.h
 include/qt4/QtGui/qradiobutton.h
 include/qt4/QtGui/qregion.h
 include/qt4/QtGui/qrgb.h
 include/qt4/QtGui/qrubberband.h
+include/qt4/QtGui/qs60mainapplication.h
+include/qt4/QtGui/qs60mainappui.h
+include/qt4/QtGui/qs60maindocument.h
+include/qt4/QtGui/qs60style.h
+include/qt4/QtGui/qscreen_qws.h
+include/qt4/QtGui/qscreendriverfactory_qws.h
+include/qt4/QtGui/qscreendriverplugin_qws.h
+include/qt4/QtGui/qscreenlinuxfb_qws.h
+include/qt4/QtGui/qscreenproxy_qws.h
+include/qt4/QtGui/qscreenqnx_qws.h
+include/qt4/QtGui/qscreentransformed_qws.h
+include/qt4/QtGui/qscreenvfb_qws.h
 include/qt4/QtGui/qscrollarea.h
 include/qt4/QtGui/qscrollbar.h
 include/qt4/QtGui/qsessionmanager.h
@@ -740,6 +988,7 @@ include/qt4/QtGui/qsizepolicy.h
 include/qt4/QtGui/qslider.h
 include/qt4/QtGui/qsortfilterproxymodel.h
 include/qt4/QtGui/qsound.h
+include/qt4/QtGui/qsoundqss_qws.h
 include/qt4/QtGui/qspinbox.h
 include/qt4/QtGui/qsplashscreen.h
 include/qt4/QtGui/qsplitter.h
@@ -754,6 +1003,7 @@ include/qt4/QtGui/qstylefactory.h
 include/qt4/QtGui/qstyleoption.h
 include/qt4/QtGui/qstylepainter.h
 include/qt4/QtGui/qstyleplugin.h
+include/qt4/QtGui/qsymbianevent.h
 include/qt4/QtGui/qsyntaxhighlighter.h
 include/qt4/QtGui/qsystemtrayicon.h
 include/qt4/QtGui/qtabbar.h
@@ -777,6 +1027,8 @@ include/qt4/QtGui/qtoolbox.h
 include/qt4/QtGui/qtoolbutton.h
 include/qt4/QtGui/qtooltip.h
 include/qt4/QtGui/qtransform.h
+include/qt4/QtGui/qtransportauth_qws.h
+include/qt4/QtGui/qtransportauthdefs_qws.h
 include/qt4/QtGui/qtreeview.h
 include/qt4/QtGui/qtreewidget.h
 include/qt4/QtGui/qtreewidgetitemiterator.h
@@ -784,18 +1036,33 @@ include/qt4/QtGui/qundogroup.h
 include/qt4/QtGui/qundostack.h
 include/qt4/QtGui/qundoview.h
 include/qt4/QtGui/qvalidator.h
+include/qt4/QtGui/qvector2d.h
+include/qt4/QtGui/qvector3d.h
+include/qt4/QtGui/qvector4d.h
+include/qt4/QtGui/qvfbhdr.h
 include/qt4/QtGui/qwhatsthis.h
 include/qt4/QtGui/qwidget.h
 include/qt4/QtGui/qwidgetaction.h
 include/qt4/QtGui/qwindowdefs.h
+include/qt4/QtGui/qwindowdefs_win.h
 include/qt4/QtGui/qwindowscestyle.h
 include/qt4/QtGui/qwindowsmobilestyle.h
 include/qt4/QtGui/qwindowsstyle.h
 include/qt4/QtGui/qwindowsvistastyle.h
 include/qt4/QtGui/qwindowsxpstyle.h
+include/qt4/QtGui/qwindowsystem_qws.h
 include/qt4/QtGui/qwizard.h
 include/qt4/QtGui/qwmatrix.h
 include/qt4/QtGui/qworkspace.h
+include/qt4/QtGui/qwscursor_qws.h
+include/qt4/QtGui/qwsdisplay_qws.h
+include/qt4/QtGui/qwsembedwidget.h
+include/qt4/QtGui/qwsevent_qws.h
+include/qt4/QtGui/qwsmanager_qws.h
+include/qt4/QtGui/qwsproperty_qws.h
+include/qt4/QtGui/qwsprotocolitem_qws.h
+include/qt4/QtGui/qwssocket_qws.h
+include/qt4/QtGui/qwsutils_qws.h
 include/qt4/QtGui/qx11embed_x11.h
 include/qt4/QtGui/qx11info_x11.h
 lib/qt4/libQtGui.la
@@ -806,6 +1073,7 @@ lib/qt4/libQtGui.so.%%SHLIB_SHVER%%
 lib/qt4/libQtGui.so.%%SHLIB_VER%%
 %%DEBUG%%lib/qt4/libQtGui.so.%%SHLIB_VER%%.debug
 libdata/pkgconfig/QtGui.pc
+@dirrmtry lib/qt4
 @dirrm include/qt4/QtGui
 @dirrmtry include/qt4/Qt
 @dirrmtry include/qt4