8 files changed, 745 insertions, 119 deletions

diff --git a/misc/qt4-doc/Makefile b/misc/qt4-doc/Makefile
index 1b098555112b..ce26f6853704 100644
--- a/misc/qt4-doc/Makefile
+++ b/misc/qt4-doc/Makefile
@@ -7,29 +7,20 @@
 #
 
 PORTNAME=	doc
-PORTVERSION=	4.2.3
+PORTVERSION=	${QT4_VERSION}
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
-PKGNAMEPREFIX= 	qt4-
+PKGNAMEPREFIX=	qt4-
 DISTNAME=	qt-x11-opensource-src-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Multiplatform C++ application framework
 
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
+QT_DIST=	yes
 
 NO_BUILD=	yes
 
-CONFIGURE_ARGS=	-fast -no-exceptions \
-		-platform ${LOCALBASE}/share/qt/mkspecs/freebsd-g++ \
-		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX} \
-		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-		-confirm-license
-
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -53,4 +44,5 @@ do-install:
 	${RM} -f ${WRKSRC}/doc/html/qmake*
 	${CP} -Rp ${WRKSRC}/doc/html ${DOCSDIR}
 
+.include "${.CURDIR}/../../Mk/bsd.qt.mk"
 .include <bsd.port.mk>
diff --git a/misc/qt4-doc/distinfo b/misc/qt4-doc/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/misc/qt4-doc/distinfo
+++ b/misc/qt4-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index 316c7f435cf4..8528b7770829 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -3,6 +3,7 @@
 %%DOCSDIR%%/html/abstractwidgets.html
 %%DOCSDIR%%/html/accelerators.html
 %%DOCSDIR%%/html/accessibility.html
+%%DOCSDIR%%/html/accessible.html
 %%DOCSDIR%%/html/activeqt-comapp-main-cpp.html
 %%DOCSDIR%%/html/activeqt-comapp.html
 %%DOCSDIR%%/html/activeqt-dotnet.html
@@ -36,6 +37,7 @@
 %%DOCSDIR%%/html/activeqt-testcon.html
 %%DOCSDIR%%/html/activeqt-tools.html
 %%DOCSDIR%%/html/activeqt-webbrowser-main-cpp.html
+%%DOCSDIR%%/html/activeqt-webbrowser-webaxwidget-h.html
 %%DOCSDIR%%/html/activeqt-webbrowser.html
 %%DOCSDIR%%/html/activeqt-wrapper-main-cpp.html
 %%DOCSDIR%%/html/activeqt-wrapper.html
@@ -55,7 +57,7 @@
 %%DOCSDIR%%/html/assistant-simpletextviewer.html
 %%DOCSDIR%%/html/assistant.dcf
 %%DOCSDIR%%/html/atomic-operations.html
-%%DOCSDIR%%/html/basic.html
+%%DOCSDIR%%/html/basicwidgets.html
 %%DOCSDIR%%/html/bughowto.html
 %%DOCSDIR%%/html/buildsystem.html
 %%DOCSDIR%%/html/classes.html
@@ -72,6 +74,7 @@
 %%DOCSDIR%%/html/codecs.html
 %%DOCSDIR%%/html/commercialeditions.html
 %%DOCSDIR%%/html/compatclasses.html
+%%DOCSDIR%%/html/compiler-notes.html
 %%DOCSDIR%%/html/console-edition-classes.html
 %%DOCSDIR%%/html/containers.html
 %%DOCSDIR%%/html/coordsys.html
@@ -156,6 +159,15 @@
 %%DOCSDIR%%/html/demos-textedit-textedit-h.html
 %%DOCSDIR%%/html/demos-textedit-textedit-qrc.html
 %%DOCSDIR%%/html/demos-textedit.html
+%%DOCSDIR%%/html/demos-undo-commands-cpp.html
+%%DOCSDIR%%/html/demos-undo-commands-h.html
+%%DOCSDIR%%/html/demos-undo-document-cpp.html
+%%DOCSDIR%%/html/demos-undo-document-h.html
+%%DOCSDIR%%/html/demos-undo-main-cpp.html
+%%DOCSDIR%%/html/demos-undo-mainwindow-cpp.html
+%%DOCSDIR%%/html/demos-undo-mainwindow-h.html
+%%DOCSDIR%%/html/demos-undo-undo-qrc.html
+%%DOCSDIR%%/html/demos-undo.html
 %%DOCSDIR%%/html/demos.html
 %%DOCSDIR%%/html/deployment-mac.html
 %%DOCSDIR%%/html/deployment-windows.html
@@ -232,6 +244,11 @@
 %%DOCSDIR%%/html/desktop-systray-window-h.html
 %%DOCSDIR%%/html/desktop-systray.html
 %%DOCSDIR%%/html/desktop.html
+%%DOCSDIR%%/html/dialogs-classwizard-classwizard-cpp.html
+%%DOCSDIR%%/html/dialogs-classwizard-classwizard-h.html
+%%DOCSDIR%%/html/dialogs-classwizard-classwizard-qrc.html
+%%DOCSDIR%%/html/dialogs-classwizard-main-cpp.html
+%%DOCSDIR%%/html/dialogs-classwizard.html
 %%DOCSDIR%%/html/dialogs-configdialog-configdialog-cpp.html
 %%DOCSDIR%%/html/dialogs-configdialog-configdialog-h.html
 %%DOCSDIR%%/html/dialogs-configdialog-configdialog-qrc.html
@@ -247,6 +264,11 @@
 %%DOCSDIR%%/html/dialogs-findfiles-window-cpp.html
 %%DOCSDIR%%/html/dialogs-findfiles-window-h.html
 %%DOCSDIR%%/html/dialogs-findfiles.html
+%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-cpp.html
+%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-h.html
+%%DOCSDIR%%/html/dialogs-licensewizard-licensewizard-qrc.html
+%%DOCSDIR%%/html/dialogs-licensewizard-main-cpp.html
+%%DOCSDIR%%/html/dialogs-licensewizard.html
 %%DOCSDIR%%/html/dialogs-standarddialogs-dialog-cpp.html
 %%DOCSDIR%%/html/dialogs-standarddialogs-dialog-h.html
 %%DOCSDIR%%/html/dialogs-standarddialogs-main-cpp.html
@@ -255,6 +277,8 @@
 %%DOCSDIR%%/html/dialogs-tabdialog-tabdialog-cpp.html
 %%DOCSDIR%%/html/dialogs-tabdialog-tabdialog-h.html
 %%DOCSDIR%%/html/dialogs-tabdialog.html
+%%DOCSDIR%%/html/dialogs-trivialwizard-trivialwizard-cpp.html
+%%DOCSDIR%%/html/dialogs-trivialwizard.html
 %%DOCSDIR%%/html/dialogs.html
 %%DOCSDIR%%/html/dnd.html
 %%DOCSDIR%%/html/draganddrop-draggableicons-draggableicons-qrc.html
@@ -292,6 +316,7 @@
 %%DOCSDIR%%/html/draganddrop-puzzle-puzzlewidget-h.html
 %%DOCSDIR%%/html/draganddrop-puzzle.html
 %%DOCSDIR%%/html/draganddrop.html
+%%DOCSDIR%%/html/ecmascript.html
 %%DOCSDIR%%/html/editions.html
 %%DOCSDIR%%/html/environment.html
 %%DOCSDIR%%/html/events.html
@@ -306,6 +331,7 @@
 %%DOCSDIR%%/html/gallery-motif.html
 %%DOCSDIR%%/html/gallery-plastique.html
 %%DOCSDIR%%/html/gallery-windows.html
+%%DOCSDIR%%/html/gallery-windowsvista.html
 %%DOCSDIR%%/html/gallery-windowsxp.html
 %%DOCSDIR%%/html/gallery.html
 %%DOCSDIR%%/html/geomanagement.html
@@ -316,6 +342,19 @@
 %%DOCSDIR%%/html/graphicsview-collidingmice-mouse-cpp.html
 %%DOCSDIR%%/html/graphicsview-collidingmice-mouse-h.html
 %%DOCSDIR%%/html/graphicsview-collidingmice.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-arrow-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-arrow-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramitem-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramitem-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramscene-qrc.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-diagramtextitem-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-main-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-cpp.html
+%%DOCSDIR%%/html/graphicsview-diagramscene-mainwindow-h.html
+%%DOCSDIR%%/html/graphicsview-diagramscene.html
 %%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-cpp.html
 %%DOCSDIR%%/html/graphicsview-dragdroprobot-coloritem-h.html
 %%DOCSDIR%%/html/graphicsview-dragdroprobot-main-cpp.html
@@ -362,6 +401,8 @@
 %%DOCSDIR%%/html/i18n.html
 %%DOCSDIR%%/html/images/2dpainting-example.png
 %%DOCSDIR%%/html/images/abstract-connections.png
+%%DOCSDIR%%/html/images/accessibilityarchitecture.png
+%%DOCSDIR%%/html/images/accessibleobjecttree.png
 %%DOCSDIR%%/html/images/affine-demo.png
 %%DOCSDIR%%/html/images/alphachannelimage.png
 %%DOCSDIR%%/html/images/alphafill.png
@@ -403,6 +444,7 @@
 %%DOCSDIR%%/html/images/calculatorbuilder-example.png
 %%DOCSDIR%%/html/images/calculatorform-example.png
 %%DOCSDIR%%/html/images/calendar-example.png
+%%DOCSDIR%%/html/images/calendarwidgetexample.png
 %%DOCSDIR%%/html/images/cde-calendarwidget.png
 %%DOCSDIR%%/html/images/cde-checkbox.png
 %%DOCSDIR%%/html/images/cde-combobox.png
@@ -434,13 +476,14 @@
 %%DOCSDIR%%/html/images/chart-example.png
 %%DOCSDIR%%/html/images/chat-example.png
 %%DOCSDIR%%/html/images/chip-demo.png
+%%DOCSDIR%%/html/images/classwizard-flow.png
+%%DOCSDIR%%/html/images/classwizard.png
 %%DOCSDIR%%/html/images/cleanlooks-calendarwidget.png
 %%DOCSDIR%%/html/images/cleanlooks-checkbox.png
 %%DOCSDIR%%/html/images/cleanlooks-combobox.png
 %%DOCSDIR%%/html/images/cleanlooks-dateedit.png
 %%DOCSDIR%%/html/images/cleanlooks-datetimeedit.png
 %%DOCSDIR%%/html/images/cleanlooks-dial.png
-%%DOCSDIR%%/html/images/cleanlooks-dialogbuttonbox.png
 %%DOCSDIR%%/html/images/cleanlooks-doublespinbox.png
 %%DOCSDIR%%/html/images/cleanlooks-fontcombobox.png
 %%DOCSDIR%%/html/images/cleanlooks-frame.png
@@ -465,12 +508,14 @@
 %%DOCSDIR%%/html/images/cleanlooks-treeview.png
 %%DOCSDIR%%/html/images/codecs-example.png
 %%DOCSDIR%%/html/images/collidingmice-example.png
+%%DOCSDIR%%/html/images/coloreditorfactoryimage.png
 %%DOCSDIR%%/html/images/completer-example.png
 %%DOCSDIR%%/html/images/composition-demo.png
 %%DOCSDIR%%/html/images/concentriccircles-example.png
 %%DOCSDIR%%/html/images/configdialog-example.png
 %%DOCSDIR%%/html/images/conicalGradient.png
 %%DOCSDIR%%/html/images/containerextension-example.png
+%%DOCSDIR%%/html/images/context2d-example.png
 %%DOCSDIR%%/html/images/coordinatesystem-analogclock.png
 %%DOCSDIR%%/html/images/coordinatesystem-line-antialias.png
 %%DOCSDIR%%/html/images/coordinatesystem-line-raster.png
@@ -501,6 +546,7 @@
 %%DOCSDIR%%/html/images/customsortfiltermodel-example.png
 %%DOCSDIR%%/html/images/customwidgetplugin-example.png
 %%DOCSDIR%%/html/images/datetimewidgets.png
+%%DOCSDIR%%/html/images/defaultprototypes-example.png
 %%DOCSDIR%%/html/images/deform-demo.png
 %%DOCSDIR%%/html/images/dependencies.png
 %%DOCSDIR%%/html/images/deployment-mac-application.png
@@ -508,6 +554,7 @@
 %%DOCSDIR%%/html/images/deployment-windows-depends.png
 %%DOCSDIR%%/html/images/designer-action-editor.png
 %%DOCSDIR%%/html/images/designer-adding-dockwidget.png
+%%DOCSDIR%%/html/images/designer-adding-dynamic-property.png
 %%DOCSDIR%%/html/images/designer-adding-menu-action.png
 %%DOCSDIR%%/html/images/designer-adding-toolbar-action.png
 %%DOCSDIR%%/html/images/designer-buddy-making.png
@@ -528,6 +575,7 @@
 %%DOCSDIR%%/html/images/designer-containers-stackedwidget.png
 %%DOCSDIR%%/html/images/designer-containers-tabwidget.png
 %%DOCSDIR%%/html/images/designer-containers-toolbox.png
+%%DOCSDIR%%/html/images/designer-creating-dynamic-property.png
 %%DOCSDIR%%/html/images/designer-creating-menu-entry1.png
 %%DOCSDIR%%/html/images/designer-creating-menu-entry2.png
 %%DOCSDIR%%/html/images/designer-creating-menu-entry3.png
@@ -567,6 +615,7 @@
 %%DOCSDIR%%/html/images/designer-widget-box.png
 %%DOCSDIR%%/html/images/designer-widget-tool.png
 %%DOCSDIR%%/html/images/diagonalGradient.png
+%%DOCSDIR%%/html/images/diagramscene.png
 %%DOCSDIR%%/html/images/digitalclock-example.png
 %%DOCSDIR%%/html/images/dirview-example.png
 %%DOCSDIR%%/html/images/dockwidgets-example.png
@@ -575,7 +624,9 @@
 %%DOCSDIR%%/html/images/dragdroprobot-example.png
 %%DOCSDIR%%/html/images/draggableicons-example.png
 %%DOCSDIR%%/html/images/draggabletext-example.png
+%%DOCSDIR%%/html/images/drilldown-example.png
 %%DOCSDIR%%/html/images/dropsite-example.png
+%%DOCSDIR%%/html/images/echopluginexample.png
 %%DOCSDIR%%/html/images/elasticnodes-example.png
 %%DOCSDIR%%/html/images/extension-example.png
 %%DOCSDIR%%/html/images/extension_more.png
@@ -599,14 +650,13 @@
 %%DOCSDIR%%/html/images/graphicsview-ellipseitem.png
 %%DOCSDIR%%/html/images/graphicsview-items.png
 %%DOCSDIR%%/html/images/graphicsview-lineitem.png
-%%DOCSDIR%%/html/images/graphicsview-map.png
 %%DOCSDIR%%/html/images/graphicsview-parentchild.png
 %%DOCSDIR%%/html/images/graphicsview-pathitem.png
 %%DOCSDIR%%/html/images/graphicsview-pixmapitem.png
 %%DOCSDIR%%/html/images/graphicsview-polygonitem.png
 %%DOCSDIR%%/html/images/graphicsview-rectitem.png
-%%DOCSDIR%%/html/images/graphicsview-shapes.png
-%%DOCSDIR%%/html/images/graphicsview-text.png
+%%DOCSDIR%%/html/images/graphicsview-simpletextitem.png
+%%DOCSDIR%%/html/images/graphicsview-textitem.png
 %%DOCSDIR%%/html/images/graphicsview-view.png
 %%DOCSDIR%%/html/images/graphicsview-zorder.png
 %%DOCSDIR%%/html/images/gridlayout.png
@@ -618,11 +668,11 @@
 %%DOCSDIR%%/html/images/icon.png
 %%DOCSDIR%%/html/images/icons-example.png
 %%DOCSDIR%%/html/images/icons-view-menu.png
-%%DOCSDIR%%/html/images/icons_find_mess.png
 %%DOCSDIR%%/html/images/icons_find_normal.png
 %%DOCSDIR%%/html/images/icons_find_normal_disabled.png
 %%DOCSDIR%%/html/images/icons_images_groupbox.png
 %%DOCSDIR%%/html/images/icons_monkey.png
+%%DOCSDIR%%/html/images/icons_monkey_active.png
 %%DOCSDIR%%/html/images/icons_monkey_mess.png
 %%DOCSDIR%%/html/images/icons_preview_area.png
 %%DOCSDIR%%/html/images/icons_qtopia_16x16.png
@@ -648,6 +698,8 @@
 %%DOCSDIR%%/html/images/javaiterators2.png
 %%DOCSDIR%%/html/images/layout1.png
 %%DOCSDIR%%/html/images/layout2.png
+%%DOCSDIR%%/html/images/licensewizard-example.png
+%%DOCSDIR%%/html/images/licensewizard-flow.png
 %%DOCSDIR%%/html/images/lineedits-example.png
 %%DOCSDIR%%/html/images/linguist-arrowpad_en.png
 %%DOCSDIR%%/html/images/linguist-arrowpad_fr.png
@@ -710,17 +762,22 @@
 %%DOCSDIR%%/html/images/macintosh-toolbox.png
 %%DOCSDIR%%/html/images/macintosh-toolbutton.png
 %%DOCSDIR%%/html/images/macintosh-treeview.png
+%%DOCSDIR%%/html/images/macintosh-unified-toolbar.png
+%%DOCSDIR%%/html/images/mainwindow-custom-dock.png
 %%DOCSDIR%%/html/images/mainwindow-demo.png
 %%DOCSDIR%%/html/images/mainwindow-docks-example.png
 %%DOCSDIR%%/html/images/mainwindow-docks.png
+%%DOCSDIR%%/html/images/mainwindow-vertical-dock.png
+%%DOCSDIR%%/html/images/mainwindow-vertical-tabs.png
 %%DOCSDIR%%/html/images/mainwindowlayout.png
-%%DOCSDIR%%/html/images/mandelbrot.png
+%%DOCSDIR%%/html/images/mandelbrot-example.png
 %%DOCSDIR%%/html/images/mandelbrot_scroll1.png
 %%DOCSDIR%%/html/images/mandelbrot_scroll2.png
 %%DOCSDIR%%/html/images/mandelbrot_scroll3.png
 %%DOCSDIR%%/html/images/mandelbrot_zoom1.png
 %%DOCSDIR%%/html/images/mandelbrot_zoom2.png
 %%DOCSDIR%%/html/images/mandelbrot_zoom3.png
+%%DOCSDIR%%/html/images/masterdetail-example.png
 %%DOCSDIR%%/html/images/mdi-example.png
 %%DOCSDIR%%/html/images/menus-example.png
 %%DOCSDIR%%/html/images/modelindex-no-parent.png
@@ -793,9 +850,8 @@
 %%DOCSDIR%%/html/images/plastique-dateedit.png
 %%DOCSDIR%%/html/images/plastique-datetimeedit.png
 %%DOCSDIR%%/html/images/plastique-dial.png
-%%DOCSDIR%%/html/images/plastique-dialogbuttonbox.png
 %%DOCSDIR%%/html/images/plastique-doublespinbox.png
-%%DOCSDIR%%/html/images/plastique-fontcombobox-open.png
+%%DOCSDIR%%/html/images/plastique-filedialog.png
 %%DOCSDIR%%/html/images/plastique-fontcombobox.png
 %%DOCSDIR%%/html/images/plastique-fontdialog.png
 %%DOCSDIR%%/html/images/plastique-frame.png
@@ -847,6 +903,7 @@
 %%DOCSDIR%%/html/images/qcolor-saturation.png
 %%DOCSDIR%%/html/images/qcolor-value.png
 %%DOCSDIR%%/html/images/qconicalgradient.png
+%%DOCSDIR%%/html/images/qdatawidgetmapper-simple.png
 %%DOCSDIR%%/html/images/qdesktopwidget.png
 %%DOCSDIR%%/html/images/qdockwindow.png
 %%DOCSDIR%%/html/images/qerrormessage.png
@@ -877,6 +934,8 @@
 %%DOCSDIR%%/html/images/qmatrix-combinedtransformation.png
 %%DOCSDIR%%/html/images/qmatrix-representation.png
 %%DOCSDIR%%/html/images/qmatrix-simpletransformation.png
+%%DOCSDIR%%/html/images/qmdiarea-arrange.png
+%%DOCSDIR%%/html/images/qmdisubwindowlayout.png
 %%DOCSDIR%%/html/images/qmessagebox-crit.png
 %%DOCSDIR%%/html/images/qmessagebox-info.png
 %%DOCSDIR%%/html/images/qmessagebox-quest.png
@@ -970,7 +1029,6 @@
 %%DOCSDIR%%/html/images/qtableitems.png
 %%DOCSDIR%%/html/images/qtabletevent-tilt.png
 %%DOCSDIR%%/html/images/qtconfig-appearance.png
-%%DOCSDIR%%/html/images/qtdemo-example.png
 %%DOCSDIR%%/html/images/qtdesignerextensions.png
 %%DOCSDIR%%/html/images/qtdesignerscreenshot.png
 %%DOCSDIR%%/html/images/qtextblock-sequence.png
@@ -1001,6 +1059,18 @@
 %%DOCSDIR%%/html/images/qtopiacore-setwindowattribute.png
 %%DOCSDIR%%/html/images/qtopiacore-vanilla.png
 %%DOCSDIR%%/html/images/qtopiacore-virtualframebuffer.png
+%%DOCSDIR%%/html/images/qtscript-calculator.png
+%%DOCSDIR%%/html/images/qtscript-context2d.png
+%%DOCSDIR%%/html/images/qtwizard-aero1.png
+%%DOCSDIR%%/html/images/qtwizard-aero2.png
+%%DOCSDIR%%/html/images/qtwizard-classic1.png
+%%DOCSDIR%%/html/images/qtwizard-classic2.png
+%%DOCSDIR%%/html/images/qtwizard-mac1.png
+%%DOCSDIR%%/html/images/qtwizard-mac2.png
+%%DOCSDIR%%/html/images/qtwizard-macpage.png
+%%DOCSDIR%%/html/images/qtwizard-modern1.png
+%%DOCSDIR%%/html/images/qtwizard-modern2.png
+%%DOCSDIR%%/html/images/qtwizard-nonmacpage.png
 %%DOCSDIR%%/html/images/querymodel-example.png
 %%DOCSDIR%%/html/images/qundoview.png
 %%DOCSDIR%%/html/images/qurl-authority.png
@@ -1024,6 +1094,7 @@
 %%DOCSDIR%%/html/images/resources.png
 %%DOCSDIR%%/html/images/richtext-document.png
 %%DOCSDIR%%/html/images/rintersect.png
+%%DOCSDIR%%/html/images/rsslistingexample.png
 %%DOCSDIR%%/html/images/rsubtract.png
 %%DOCSDIR%%/html/images/runion.png
 %%DOCSDIR%%/html/images/rxor.png
@@ -1050,6 +1121,7 @@
 %%DOCSDIR%%/html/images/simpletextviewer-findfiledialog.png
 %%DOCSDIR%%/html/images/simpletextviewer-mainwindow.png
 %%DOCSDIR%%/html/images/simpletreemodel-example.png
+%%DOCSDIR%%/html/images/simplewidgetmapper-example.png
 %%DOCSDIR%%/html/images/sliders-example.png
 %%DOCSDIR%%/html/images/spinboxdelegate-example.png
 %%DOCSDIR%%/html/images/spinboxes-example.png
@@ -1057,8 +1129,10 @@
 %%DOCSDIR%%/html/images/sqlbrowser-demo.png
 %%DOCSDIR%%/html/images/standard-views.png
 %%DOCSDIR%%/html/images/standarddialogs-example.png
+%%DOCSDIR%%/html/images/stardelegate.png
 %%DOCSDIR%%/html/images/stliterators1.png
 %%DOCSDIR%%/html/images/stringlistmodel.png
+%%DOCSDIR%%/html/images/stylepluginexample.png
 %%DOCSDIR%%/html/images/styles-3d.png
 %%DOCSDIR%%/html/images/styles-aliasing.png
 %%DOCSDIR%%/html/images/styles-disabledwood.png
@@ -1094,6 +1168,7 @@
 %%DOCSDIR%%/html/images/t9_2.png
 %%DOCSDIR%%/html/images/tabdialog-example.png
 %%DOCSDIR%%/html/images/tablemodel-example.png
+%%DOCSDIR%%/html/images/tabletexample.png
 %%DOCSDIR%%/html/images/taskmenuextension-dialog.png
 %%DOCSDIR%%/html/images/taskmenuextension-example-faded.png
 %%DOCSDIR%%/html/images/taskmenuextension-menu.png
@@ -1107,10 +1182,18 @@
 %%DOCSDIR%%/html/images/torrent-example.png
 %%DOCSDIR%%/html/images/transformations-example.png
 %%DOCSDIR%%/html/images/treemodel-structure.png
+%%DOCSDIR%%/html/images/treemodelcompleter-example.png
+%%DOCSDIR%%/html/images/trivialwizard-example-conclusion.png
+%%DOCSDIR%%/html/images/trivialwizard-example-flow.png
+%%DOCSDIR%%/html/images/trivialwizard-example-introduction.png
+%%DOCSDIR%%/html/images/trivialwizard-example-registration.png
 %%DOCSDIR%%/html/images/trolltech-logo.png
 %%DOCSDIR%%/html/images/tutorial8-layout.png
 %%DOCSDIR%%/html/images/tutorial8-reallayout.png
 %%DOCSDIR%%/html/images/udppackets.png
+%%DOCSDIR%%/html/images/undodemo.png
+%%DOCSDIR%%/html/images/undoframeworkexample.png
+%%DOCSDIR%%/html/images/wVista-Cert-border-small.png
 %%DOCSDIR%%/html/images/whatsthis.png
 %%DOCSDIR%%/html/images/wiggly-example.png
 %%DOCSDIR%%/html/images/windowflags-example.png
@@ -1143,6 +1226,33 @@
 %%DOCSDIR%%/html/images/windows-toolbox.png
 %%DOCSDIR%%/html/images/windows-toolbutton.png
 %%DOCSDIR%%/html/images/windows-treeview.png
+%%DOCSDIR%%/html/images/windowsvista-calendarwidget.png
+%%DOCSDIR%%/html/images/windowsvista-checkbox.png
+%%DOCSDIR%%/html/images/windowsvista-combobox.png
+%%DOCSDIR%%/html/images/windowsvista-dateedit.png
+%%DOCSDIR%%/html/images/windowsvista-datetimeedit.png
+%%DOCSDIR%%/html/images/windowsvista-dial.png
+%%DOCSDIR%%/html/images/windowsvista-doublespinbox.png
+%%DOCSDIR%%/html/images/windowsvista-fontcombobox.png
+%%DOCSDIR%%/html/images/windowsvista-frame.png
+%%DOCSDIR%%/html/images/windowsvista-groupbox.png
+%%DOCSDIR%%/html/images/windowsvista-horizontalscrollbar.png
+%%DOCSDIR%%/html/images/windowsvista-label.png
+%%DOCSDIR%%/html/images/windowsvista-lcdnumber.png
+%%DOCSDIR%%/html/images/windowsvista-lineedit.png
+%%DOCSDIR%%/html/images/windowsvista-listview.png
+%%DOCSDIR%%/html/images/windowsvista-progressbar.png
+%%DOCSDIR%%/html/images/windowsvista-pushbutton.png
+%%DOCSDIR%%/html/images/windowsvista-radiobutton.png
+%%DOCSDIR%%/html/images/windowsvista-slider.png
+%%DOCSDIR%%/html/images/windowsvista-spinbox.png
+%%DOCSDIR%%/html/images/windowsvista-tableview.png
+%%DOCSDIR%%/html/images/windowsvista-tabwidget.png
+%%DOCSDIR%%/html/images/windowsvista-textedit.png
+%%DOCSDIR%%/html/images/windowsvista-timeedit.png
+%%DOCSDIR%%/html/images/windowsvista-toolbox.png
+%%DOCSDIR%%/html/images/windowsvista-toolbutton.png
+%%DOCSDIR%%/html/images/windowsvista-treeview.png
 %%DOCSDIR%%/html/images/windowsxp-calendarwidget.png
 %%DOCSDIR%%/html/images/windowsxp-checkbox.png
 %%DOCSDIR%%/html/images/windowsxp-combobox.png
@@ -1194,6 +1304,12 @@
 %%DOCSDIR%%/html/itemviews-chart-pieview-cpp.html
 %%DOCSDIR%%/html/itemviews-chart-pieview-h.html
 %%DOCSDIR%%/html/itemviews-chart.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-colorlisteditor-cpp.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-colorlisteditor-h.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-main-cpp.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-window-cpp.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory-window-h.html
+%%DOCSDIR%%/html/itemviews-coloreditorfactory.html
 %%DOCSDIR%%/html/itemviews-customsortfiltermodel-main-cpp.html
 %%DOCSDIR%%/html/itemviews-customsortfiltermodel-mysortfilterproxymodel-cpp.html
 %%DOCSDIR%%/html/itemviews-customsortfiltermodel-mysortfilterproxymodel-h.html
@@ -1235,10 +1351,22 @@
 %%DOCSDIR%%/html/itemviews-simpletreemodel-treemodel-cpp.html
 %%DOCSDIR%%/html/itemviews-simpletreemodel-treemodel-h.html
 %%DOCSDIR%%/html/itemviews-simpletreemodel.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper-main-cpp.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper-window-cpp.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper-window-h.html
+%%DOCSDIR%%/html/itemviews-simplewidgetmapper.html
 %%DOCSDIR%%/html/itemviews-spinboxdelegate-delegate-cpp.html
 %%DOCSDIR%%/html/itemviews-spinboxdelegate-delegate-h.html
 %%DOCSDIR%%/html/itemviews-spinboxdelegate-main-cpp.html
 %%DOCSDIR%%/html/itemviews-spinboxdelegate.html
+%%DOCSDIR%%/html/itemviews-stardelegate-main-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stardelegate-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stardelegate-h.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stareditor-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-stareditor-h.html
+%%DOCSDIR%%/html/itemviews-stardelegate-starrating-cpp.html
+%%DOCSDIR%%/html/itemviews-stardelegate-starrating-h.html
+%%DOCSDIR%%/html/itemviews-stardelegate.html
 %%DOCSDIR%%/html/known-issues.html
 %%DOCSDIR%%/html/layout.html
 %%DOCSDIR%%/html/layouts-basiclayouts-dialog-cpp.html
@@ -1282,6 +1410,7 @@
 %%DOCSDIR%%/html/linguist-trollprint-printpanel-cpp.html
 %%DOCSDIR%%/html/linguist-trollprint-printpanel-h.html
 %%DOCSDIR%%/html/linguist-trollprint.html
+%%DOCSDIR%%/html/linguist-ts-file-format.html
 %%DOCSDIR%%/html/linguist.dcf
 %%DOCSDIR%%/html/mac-differences.html
 %%DOCSDIR%%/html/mainclasses.html
@@ -1510,7 +1639,6 @@
 %%DOCSDIR%%/html/painting-painterpaths-window-cpp.html
 %%DOCSDIR%%/html/painting-painterpaths-window-h.html
 %%DOCSDIR%%/html/painting-painterpaths.html
-%%DOCSDIR%%/html/painting-separations.html
 %%DOCSDIR%%/html/painting-svgviewer-main-cpp.html
 %%DOCSDIR%%/html/painting-svgviewer-mainwindow-cpp.html
 %%DOCSDIR%%/html/painting-svgviewer-mainwindow-h.html
@@ -1528,12 +1656,16 @@
 %%DOCSDIR%%/html/painting-transformations.html
 %%DOCSDIR%%/html/paintsystem.html
 %%DOCSDIR%%/html/pdf-licensing.html
+%%DOCSDIR%%/html/platform-notes-mac.html
+%%DOCSDIR%%/html/platform-notes-windows.html
+%%DOCSDIR%%/html/platform-notes-x11.html
 %%DOCSDIR%%/html/platform-notes.html
 %%DOCSDIR%%/html/plugins-howto.html
 %%DOCSDIR%%/html/plugins.html
 %%DOCSDIR%%/html/porting.html
 %%DOCSDIR%%/html/porting4-designer.html
 %%DOCSDIR%%/html/porting4-dnd.html
+%%DOCSDIR%%/html/porting4-overview.html
 %%DOCSDIR%%/html/porting4.html
 %%DOCSDIR%%/html/printing.html
 %%DOCSDIR%%/html/properties.html
@@ -1855,10 +1987,20 @@
 %%DOCSDIR%%/html/qabstractextensionfactory.html
 %%DOCSDIR%%/html/qabstractextensionmanager-members.html
 %%DOCSDIR%%/html/qabstractextensionmanager.html
+%%DOCSDIR%%/html/qabstractfileengine-extensionoption.html
+%%DOCSDIR%%/html/qabstractfileengine-extensionreturn.html
 %%DOCSDIR%%/html/qabstractfileengine-members.html
 %%DOCSDIR%%/html/qabstractfileengine.html
 %%DOCSDIR%%/html/qabstractfileenginehandler-members.html
 %%DOCSDIR%%/html/qabstractfileenginehandler.html
+%%DOCSDIR%%/html/qabstractfileengineiterator-members.html
+%%DOCSDIR%%/html/qabstractfileengineiterator.html
+%%DOCSDIR%%/html/qabstractfontengine-fixedpoint-members.html
+%%DOCSDIR%%/html/qabstractfontengine-fixedpoint.html
+%%DOCSDIR%%/html/qabstractfontengine-glyphmetrics-members.html
+%%DOCSDIR%%/html/qabstractfontengine-glyphmetrics.html
+%%DOCSDIR%%/html/qabstractfontengine-members.html
+%%DOCSDIR%%/html/qabstractfontengine.html
 %%DOCSDIR%%/html/qabstractformbuilder-members.html
 %%DOCSDIR%%/html/qabstractformbuilder.html
 %%DOCSDIR%%/html/qabstractgraphicsshapeitem-members.html
@@ -1925,6 +2067,8 @@
 %%DOCSDIR%%/html/qapplication.html
 %%DOCSDIR%%/html/qassistantclient-members.html
 %%DOCSDIR%%/html/qassistantclient.html
+%%DOCSDIR%%/html/qauthenticator-members.html
+%%DOCSDIR%%/html/qauthenticator.html
 %%DOCSDIR%%/html/qaxaggregated-members.html
 %%DOCSDIR%%/html/qaxaggregated.html
 %%DOCSDIR%%/html/qaxbase-members.html
@@ -1978,6 +2122,7 @@
 %%DOCSDIR%%/html/qcache-qt3.html
 %%DOCSDIR%%/html/qcache.html
 %%DOCSDIR%%/html/qcalendarwidget-members.html
+%%DOCSDIR%%/html/qcalendarwidget-obsolete.html
 %%DOCSDIR%%/html/qcalendarwidget.html
 %%DOCSDIR%%/html/qcdestyle-members.html
 %%DOCSDIR%%/html/qcdestyle.html
@@ -1998,6 +2143,7 @@
 %%DOCSDIR%%/html/qcloseevent-members.html
 %%DOCSDIR%%/html/qcloseevent.html
 %%DOCSDIR%%/html/qcolor-members.html
+%%DOCSDIR%%/html/qcolor-obsolete.html
 %%DOCSDIR%%/html/qcolor-qt3.html
 %%DOCSDIR%%/html/qcolor.html
 %%DOCSDIR%%/html/qcolordialog-members.html
@@ -2008,6 +2154,8 @@
 %%DOCSDIR%%/html/qcolorgroup.html
 %%DOCSDIR%%/html/qcolormap-members.html
 %%DOCSDIR%%/html/qcolormap.html
+%%DOCSDIR%%/html/qcolumnview-members.html
+%%DOCSDIR%%/html/qcolumnview.html
 %%DOCSDIR%%/html/qcombobox-members.html
 %%DOCSDIR%%/html/qcombobox-obsolete.html
 %%DOCSDIR%%/html/qcombobox-qt3.html
@@ -2030,6 +2178,8 @@
 %%DOCSDIR%%/html/qcoreapplication-members.html
 %%DOCSDIR%%/html/qcoreapplication-qt3.html
 %%DOCSDIR%%/html/qcoreapplication.html
+%%DOCSDIR%%/html/qcryptographichash-members.html
+%%DOCSDIR%%/html/qcryptographichash.html
 %%DOCSDIR%%/html/qcursor-members.html
 %%DOCSDIR%%/html/qcursor.html
 %%DOCSDIR%%/html/qcustomevent-members.html
@@ -2065,6 +2215,8 @@
 %%DOCSDIR%%/html/qdbusconnection.html
 %%DOCSDIR%%/html/qdbusconnectioninterface-members.html
 %%DOCSDIR%%/html/qdbusconnectioninterface.html
+%%DOCSDIR%%/html/qdbuscontext-members.html
+%%DOCSDIR%%/html/qdbuscontext.html
 %%DOCSDIR%%/html/qdbusdeclaringsignals.html
 %%DOCSDIR%%/html/qdbusdeclaringslots.html
 %%DOCSDIR%%/html/qdbuserror-members.html
@@ -2084,6 +2236,7 @@
 %%DOCSDIR%%/html/qdbustypesystem.html
 %%DOCSDIR%%/html/qdbusvariant-members.html
 %%DOCSDIR%%/html/qdbusvariant.html
+%%DOCSDIR%%/html/qdbusviewer.html
 %%DOCSDIR%%/html/qdbusxml2cpp.html
 %%DOCSDIR%%/html/qdecoration-members.html
 %%DOCSDIR%%/html/qdecoration.html
@@ -2099,6 +2252,8 @@
 %%DOCSDIR%%/html/qdesignercustomwidgetcollectioninterface.html
 %%DOCSDIR%%/html/qdesignercustomwidgetinterface-members.html
 %%DOCSDIR%%/html/qdesignercustomwidgetinterface.html
+%%DOCSDIR%%/html/qdesignerdynamicpropertysheetextension-members.html
+%%DOCSDIR%%/html/qdesignerdynamicpropertysheetextension.html
 %%DOCSDIR%%/html/qdesignerformeditorinterface-members.html
 %%DOCSDIR%%/html/qdesignerformeditorinterface.html
 %%DOCSDIR%%/html/qdesignerformwindowcursorinterface-members.html
@@ -2139,6 +2294,8 @@
 %%DOCSDIR%%/html/qdirectpainter-members.html
 %%DOCSDIR%%/html/qdirectpainter-obsolete.html
 %%DOCSDIR%%/html/qdirectpainter.html
+%%DOCSDIR%%/html/qdiriterator-members.html
+%%DOCSDIR%%/html/qdiriterator.html
 %%DOCSDIR%%/html/qdirmodel-members.html
 %%DOCSDIR%%/html/qdirmodel.html
 %%DOCSDIR%%/html/qdockwidget-members.html
@@ -2183,6 +2340,7 @@
 %%DOCSDIR%%/html/qdoublevalidator-qt3.html
 %%DOCSDIR%%/html/qdoublevalidator.html
 %%DOCSDIR%%/html/qdrag-members.html
+%%DOCSDIR%%/html/qdrag-obsolete.html
 %%DOCSDIR%%/html/qdrag.html
 %%DOCSDIR%%/html/qdragenterevent-members.html
 %%DOCSDIR%%/html/qdragenterevent.html
@@ -2242,6 +2400,10 @@
 %%DOCSDIR%%/html/qfontdatabase.html
 %%DOCSDIR%%/html/qfontdialog-members.html
 %%DOCSDIR%%/html/qfontdialog.html
+%%DOCSDIR%%/html/qfontengineinfo-members.html
+%%DOCSDIR%%/html/qfontengineinfo.html
+%%DOCSDIR%%/html/qfontengineplugin-members.html
+%%DOCSDIR%%/html/qfontengineplugin.html
 %%DOCSDIR%%/html/qfontinfo-members.html
 %%DOCSDIR%%/html/qfontinfo.html
 %%DOCSDIR%%/html/qfontmetrics-members.html
@@ -2284,6 +2446,7 @@
 %%DOCSDIR%%/html/qgraphicsellipseitem-members.html
 %%DOCSDIR%%/html/qgraphicsellipseitem.html
 %%DOCSDIR%%/html/qgraphicsitem-members.html
+%%DOCSDIR%%/html/qgraphicsitem-obsolete.html
 %%DOCSDIR%%/html/qgraphicsitem.html
 %%DOCSDIR%%/html/qgraphicsitemanimation-members.html
 %%DOCSDIR%%/html/qgraphicsitemanimation.html
@@ -2364,6 +2527,7 @@
 %%DOCSDIR%%/html/qhttpresponseheader-members.html
 %%DOCSDIR%%/html/qhttpresponseheader.html
 %%DOCSDIR%%/html/qicon-members.html
+%%DOCSDIR%%/html/qicon-obsolete.html
 %%DOCSDIR%%/html/qicon-qt3.html
 %%DOCSDIR%%/html/qicon.html
 %%DOCSDIR%%/html/qicondragevent-members.html
@@ -2372,6 +2536,10 @@
 %%DOCSDIR%%/html/qiconengine.html
 %%DOCSDIR%%/html/qiconengineplugin-members.html
 %%DOCSDIR%%/html/qiconengineplugin.html
+%%DOCSDIR%%/html/qiconenginepluginv2-members.html
+%%DOCSDIR%%/html/qiconenginepluginv2.html
+%%DOCSDIR%%/html/qiconenginev2-members.html
+%%DOCSDIR%%/html/qiconenginev2.html
 %%DOCSDIR%%/html/qimage-members.html
 %%DOCSDIR%%/html/qimage-obsolete.html
 %%DOCSDIR%%/html/qimage-qt3.html
@@ -2409,6 +2577,8 @@
 %%DOCSDIR%%/html/qiodevice.html
 %%DOCSDIR%%/html/qitemdelegate-members.html
 %%DOCSDIR%%/html/qitemdelegate.html
+%%DOCSDIR%%/html/qitemeditorcreator-members.html
+%%DOCSDIR%%/html/qitemeditorcreator.html
 %%DOCSDIR%%/html/qitemeditorcreatorbase-members.html
 %%DOCSDIR%%/html/qitemeditorcreatorbase.html
 %%DOCSDIR%%/html/qitemeditorfactory-members.html
@@ -2438,6 +2608,7 @@
 %%DOCSDIR%%/html/qlatin1string-members.html
 %%DOCSDIR%%/html/qlatin1string.html
 %%DOCSDIR%%/html/qlayout-members.html
+%%DOCSDIR%%/html/qlayout-obsolete.html
 %%DOCSDIR%%/html/qlayout-qt3.html
 %%DOCSDIR%%/html/qlayout.html
 %%DOCSDIR%%/html/qlayoutitem-members.html
@@ -2490,6 +2661,7 @@
 %%DOCSDIR%%/html/qmacpasteboardmime-members.html
 %%DOCSDIR%%/html/qmacpasteboardmime.html
 %%DOCSDIR%%/html/qmacstyle-members.html
+%%DOCSDIR%%/html/qmacstyle-obsolete.html
 %%DOCSDIR%%/html/qmacstyle.html
 %%DOCSDIR%%/html/qmainwindow-members.html
 %%DOCSDIR%%/html/qmainwindow-qt3.html
@@ -2508,6 +2680,10 @@
 %%DOCSDIR%%/html/qmatrix-members.html
 %%DOCSDIR%%/html/qmatrix-qt3.html
 %%DOCSDIR%%/html/qmatrix.html
+%%DOCSDIR%%/html/qmdiarea-members.html
+%%DOCSDIR%%/html/qmdiarea.html
+%%DOCSDIR%%/html/qmdisubwindow-members.html
+%%DOCSDIR%%/html/qmdisubwindow.html
 %%DOCSDIR%%/html/qmenu-members.html
 %%DOCSDIR%%/html/qmenu-qt3.html
 %%DOCSDIR%%/html/qmenu.html
@@ -2627,6 +2803,7 @@
 %%DOCSDIR%%/html/qpictureio-members.html
 %%DOCSDIR%%/html/qpictureio.html
 %%DOCSDIR%%/html/qpixmap-members.html
+%%DOCSDIR%%/html/qpixmap-obsolete.html
 %%DOCSDIR%%/html/qpixmap-qt3.html
 %%DOCSDIR%%/html/qpixmap.html
 %%DOCSDIR%%/html/qpixmapcache-members.html
@@ -2699,6 +2876,7 @@
 %%DOCSDIR%%/html/qresizeevent-members.html
 %%DOCSDIR%%/html/qresizeevent.html
 %%DOCSDIR%%/html/qresource-members.html
+%%DOCSDIR%%/html/qresource-obsolete.html
 %%DOCSDIR%%/html/qresource.html
 %%DOCSDIR%%/html/qrubberband-members.html
 %%DOCSDIR%%/html/qrubberband.html
@@ -2710,6 +2888,18 @@
 %%DOCSDIR%%/html/qscreendriverfactory.html
 %%DOCSDIR%%/html/qscreendriverplugin-members.html
 %%DOCSDIR%%/html/qscreendriverplugin.html
+%%DOCSDIR%%/html/qscriptable-members.html
+%%DOCSDIR%%/html/qscriptable.html
+%%DOCSDIR%%/html/qscriptcontext-members.html
+%%DOCSDIR%%/html/qscriptcontext.html
+%%DOCSDIR%%/html/qscriptengine-members.html
+%%DOCSDIR%%/html/qscriptengine.html
+%%DOCSDIR%%/html/qscriptextensionplugin-members.html
+%%DOCSDIR%%/html/qscriptextensionplugin.html
+%%DOCSDIR%%/html/qscriptvalue-members.html
+%%DOCSDIR%%/html/qscriptvalue.html
+%%DOCSDIR%%/html/qscriptvalueiterator-members.html
+%%DOCSDIR%%/html/qscriptvalueiterator.html
 %%DOCSDIR%%/html/qscrollarea-members.html
 %%DOCSDIR%%/html/qscrollarea.html
 %%DOCSDIR%%/html/qscrollbar-members.html
@@ -2763,6 +2953,7 @@
 %%DOCSDIR%%/html/qsocketnotifier-qt3.html
 %%DOCSDIR%%/html/qsocketnotifier.html
 %%DOCSDIR%%/html/qsortfilterproxymodel-members.html
+%%DOCSDIR%%/html/qsortfilterproxymodel-obsolete.html
 %%DOCSDIR%%/html/qsortfilterproxymodel.html
 %%DOCSDIR%%/html/qsound-members.html
 %%DOCSDIR%%/html/qsound-qt3.html
@@ -2821,6 +3012,17 @@
 %%DOCSDIR%%/html/qsqlresult.html
 %%DOCSDIR%%/html/qsqltablemodel-members.html
 %%DOCSDIR%%/html/qsqltablemodel.html
+%%DOCSDIR%%/html/qssl.html
+%%DOCSDIR%%/html/qsslcertificate-members.html
+%%DOCSDIR%%/html/qsslcertificate.html
+%%DOCSDIR%%/html/qsslcipher-members.html
+%%DOCSDIR%%/html/qsslcipher.html
+%%DOCSDIR%%/html/qsslerror-members.html
+%%DOCSDIR%%/html/qsslerror.html
+%%DOCSDIR%%/html/qsslkey-members.html
+%%DOCSDIR%%/html/qsslkey.html
+%%DOCSDIR%%/html/qsslsocket-members.html
+%%DOCSDIR%%/html/qsslsocket.html
 %%DOCSDIR%%/html/qstack-members.html
 %%DOCSDIR%%/html/qstack.html
 %%DOCSDIR%%/html/qstackedlayout-members.html
@@ -2849,7 +3051,10 @@
 %%DOCSDIR%%/html/qstringlistmodel.html
 %%DOCSDIR%%/html/qstringmatcher-members.html
 %%DOCSDIR%%/html/qstringmatcher.html
+%%DOCSDIR%%/html/qstringref-members.html
+%%DOCSDIR%%/html/qstringref.html
 %%DOCSDIR%%/html/qstyle-members.html
+%%DOCSDIR%%/html/qstyle-obsolete.html
 %%DOCSDIR%%/html/qstyle.html
 %%DOCSDIR%%/html/qstylefactory-members.html
 %%DOCSDIR%%/html/qstylefactory.html
@@ -2857,6 +3062,8 @@
 %%DOCSDIR%%/html/qstylehintreturn.html
 %%DOCSDIR%%/html/qstylehintreturnmask-members.html
 %%DOCSDIR%%/html/qstylehintreturnmask.html
+%%DOCSDIR%%/html/qstylehintreturnvariant-members.html
+%%DOCSDIR%%/html/qstylehintreturnvariant.html
 %%DOCSDIR%%/html/qstyleoption-members.html
 %%DOCSDIR%%/html/qstyleoption-obsolete.html
 %%DOCSDIR%%/html/qstyleoption.html
@@ -2914,6 +3121,8 @@
 %%DOCSDIR%%/html/qstyleoptiontoolbar.html
 %%DOCSDIR%%/html/qstyleoptiontoolbox-members.html
 %%DOCSDIR%%/html/qstyleoptiontoolbox.html
+%%DOCSDIR%%/html/qstyleoptiontoolboxv2-members.html
+%%DOCSDIR%%/html/qstyleoptiontoolboxv2.html
 %%DOCSDIR%%/html/qstyleoptiontoolbutton-members.html
 %%DOCSDIR%%/html/qstyleoptiontoolbutton.html
 %%DOCSDIR%%/html/qstyleoptionviewitem-members.html
@@ -2924,6 +3133,8 @@
 %%DOCSDIR%%/html/qstylepainter.html
 %%DOCSDIR%%/html/qstyleplugin-members.html
 %%DOCSDIR%%/html/qstyleplugin.html
+%%DOCSDIR%%/html/qsvggenerator-members.html
+%%DOCSDIR%%/html/qsvggenerator.html
 %%DOCSDIR%%/html/qsvgrenderer-members.html
 %%DOCSDIR%%/html/qsvgrenderer.html
 %%DOCSDIR%%/html/qsvgwidget-members.html
@@ -2943,7 +3154,7 @@
 %%DOCSDIR%%/html/qt3support.html
 %%DOCSDIR%%/html/qt3to4-treewalker.html
 %%DOCSDIR%%/html/qt3to4.html
-%%DOCSDIR%%/html/qt4-2-intro.html
+%%DOCSDIR%%/html/qt4-3-intro.html
 %%DOCSDIR%%/html/qt4-accessibility.html
 %%DOCSDIR%%/html/qt4-arthur.html
 %%DOCSDIR%%/html/qt4-designer.html
@@ -3014,6 +3225,7 @@
 %%DOCSDIR%%/html/qtextbrowser-qt3.html
 %%DOCSDIR%%/html/qtextbrowser.html
 %%DOCSDIR%%/html/qtextcharformat-members.html
+%%DOCSDIR%%/html/qtextcharformat-obsolete.html
 %%DOCSDIR%%/html/qtextcharformat.html
 %%DOCSDIR%%/html/qtextcodec-converterstate-members.html
 %%DOCSDIR%%/html/qtextcodec-converterstate.html
@@ -3116,6 +3328,12 @@
 %%DOCSDIR%%/html/qtooltip.html
 %%DOCSDIR%%/html/qtopengl.html
 %%DOCSDIR%%/html/qtopiacore-accel.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qscreenahigl-qws-cpp.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qscreenahigl-qws-h.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qscreenahiglplugin-cpp.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qwindowsurface-ahigl-cpp.html
+%%DOCSDIR%%/html/qtopiacore-ahigl-qwindowsurface-ahigl-p-h.html
+%%DOCSDIR%%/html/qtopiacore-ahigl.html
 %%DOCSDIR%%/html/qtopiacore-architecture.html
 %%DOCSDIR%%/html/qtopiacore-charinput.html
 %%DOCSDIR%%/html/qtopiacore-crosscompiling.html
@@ -3154,6 +3372,8 @@
 %%DOCSDIR%%/html/qtopiacore-vnc.html
 %%DOCSDIR%%/html/qtopiacore.html
 %%DOCSDIR%%/html/qtplugin.html
+%%DOCSDIR%%/html/qtransform-members.html
+%%DOCSDIR%%/html/qtransform.html
 %%DOCSDIR%%/html/qtranslator-members.html
 %%DOCSDIR%%/html/qtranslator-qt3.html
 %%DOCSDIR%%/html/qtranslator.html
@@ -3168,6 +3388,8 @@
 %%DOCSDIR%%/html/qtreewidgetitem.html
 %%DOCSDIR%%/html/qtreewidgetitemiterator-members.html
 %%DOCSDIR%%/html/qtreewidgetitemiterator.html
+%%DOCSDIR%%/html/qtscript.html
+%%DOCSDIR%%/html/qtscriptextensions.html
 %%DOCSDIR%%/html/qtsql.html
 %%DOCSDIR%%/html/qtsvg.html
 %%DOCSDIR%%/html/qttest.html
@@ -3210,6 +3432,8 @@
 %%DOCSDIR%%/html/qvector.html
 %%DOCSDIR%%/html/qvectoriterator-members.html
 %%DOCSDIR%%/html/qvectoriterator.html
+%%DOCSDIR%%/html/qvncscreen-members.html
+%%DOCSDIR%%/html/qvncscreen.html
 %%DOCSDIR%%/html/qwaitcondition-members.html
 %%DOCSDIR%%/html/qwaitcondition.html
 %%DOCSDIR%%/html/qwhatsthis-members.html
@@ -3234,8 +3458,14 @@
 %%DOCSDIR%%/html/qwindowsstyle.html
 %%DOCSDIR%%/html/qwindowstatechangeevent-members.html
 %%DOCSDIR%%/html/qwindowstatechangeevent.html
+%%DOCSDIR%%/html/qwindowsvistastyle-members.html
+%%DOCSDIR%%/html/qwindowsvistastyle.html
 %%DOCSDIR%%/html/qwindowsxpstyle-members.html
 %%DOCSDIR%%/html/qwindowsxpstyle.html
+%%DOCSDIR%%/html/qwizard-members.html
+%%DOCSDIR%%/html/qwizard.html
+%%DOCSDIR%%/html/qwizardpage-members.html
+%%DOCSDIR%%/html/qwizardpage.html
 %%DOCSDIR%%/html/qworkspace-members.html
 %%DOCSDIR%%/html/qworkspace-qt3.html
 %%DOCSDIR%%/html/qworkspace.html
@@ -3250,6 +3480,8 @@
 %%DOCSDIR%%/html/qwsembedwidget.html
 %%DOCSDIR%%/html/qwsevent-members.html
 %%DOCSDIR%%/html/qwsevent.html
+%%DOCSDIR%%/html/qwsglwindowsurface-members.html
+%%DOCSDIR%%/html/qwsglwindowsurface.html
 %%DOCSDIR%%/html/qwsinputmethod-members.html
 %%DOCSDIR%%/html/qwsinputmethod-obsolete.html
 %%DOCSDIR%%/html/qwsinputmethod.html
@@ -3269,8 +3501,6 @@
 %%DOCSDIR%%/html/qwsserver.html
 %%DOCSDIR%%/html/qwswindow-members.html
 %%DOCSDIR%%/html/qwswindow.html
-%%DOCSDIR%%/html/qwswindowsurface-members.html
-%%DOCSDIR%%/html/qwswindowsurface.html
 %%DOCSDIR%%/html/qx11embedcontainer-members.html
 %%DOCSDIR%%/html/qx11embedcontainer.html
 %%DOCSDIR%%/html/qx11embedwidget-members.html
@@ -3307,6 +3537,20 @@
 %%DOCSDIR%%/html/qxmlreader.html
 %%DOCSDIR%%/html/qxmlsimplereader-members.html
 %%DOCSDIR%%/html/qxmlsimplereader.html
+%%DOCSDIR%%/html/qxmlstreamattribute-members.html
+%%DOCSDIR%%/html/qxmlstreamattribute.html
+%%DOCSDIR%%/html/qxmlstreamattributes-members.html
+%%DOCSDIR%%/html/qxmlstreamattributes.html
+%%DOCSDIR%%/html/qxmlstreamentitydeclaration-members.html
+%%DOCSDIR%%/html/qxmlstreamentitydeclaration.html
+%%DOCSDIR%%/html/qxmlstreamnamespacedeclaration-members.html
+%%DOCSDIR%%/html/qxmlstreamnamespacedeclaration.html
+%%DOCSDIR%%/html/qxmlstreamnotationdeclaration-members.html
+%%DOCSDIR%%/html/qxmlstreamnotationdeclaration.html
+%%DOCSDIR%%/html/qxmlstreamreader-members.html
+%%DOCSDIR%%/html/qxmlstreamreader.html
+%%DOCSDIR%%/html/qxmlstreamwriter-members.html
+%%DOCSDIR%%/html/qxmlstreamwriter.html
 %%DOCSDIR%%/html/rcc.html
 %%DOCSDIR%%/html/resources.html
 %%DOCSDIR%%/html/richtext-advanced-processing.html
@@ -3331,6 +3575,58 @@
 %%DOCSDIR%%/html/richtext-syntaxhighlighter-mainwindow-h.html
 %%DOCSDIR%%/html/richtext-syntaxhighlighter.html
 %%DOCSDIR%%/html/richtext.html
+%%DOCSDIR%%/html/script-calculator-calculator-js.html
+%%DOCSDIR%%/html/script-calculator-calculator-qrc.html
+%%DOCSDIR%%/html/script-calculator-main-cpp.html
+%%DOCSDIR%%/html/script-calculator.html
+%%DOCSDIR%%/html/script-context2d-context2d-cpp.html
+%%DOCSDIR%%/html/script-context2d-context2d-h.html
+%%DOCSDIR%%/html/script-context2d-context2d-qrc.html
+%%DOCSDIR%%/html/script-context2d-domimage-cpp.html
+%%DOCSDIR%%/html/script-context2d-domimage-h.html
+%%DOCSDIR%%/html/script-context2d-main-cpp.html
+%%DOCSDIR%%/html/script-context2d-qcontext2dcanvas-cpp.html
+%%DOCSDIR%%/html/script-context2d-qcontext2dcanvas-h.html
+%%DOCSDIR%%/html/script-context2d-scripts-alpha-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-arc-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-bezier-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-clock-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-fill1-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-grad-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-linecap-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-linestye-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-moveto-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-moveto2-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-pacman-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-plasma-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-pong-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-quad-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-rgba-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-rotate-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-scale-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-stroke1-js.html
+%%DOCSDIR%%/html/script-context2d-scripts-translate-js.html
+%%DOCSDIR%%/html/script-context2d-window-cpp.html
+%%DOCSDIR%%/html/script-context2d-window-h.html
+%%DOCSDIR%%/html/script-context2d.html
+%%DOCSDIR%%/html/script-defaultprototypes-code-js.html
+%%DOCSDIR%%/html/script-defaultprototypes-defaultprototypes-qrc.html
+%%DOCSDIR%%/html/script-defaultprototypes-main-cpp.html
+%%DOCSDIR%%/html/script-defaultprototypes-prototypes-cpp.html
+%%DOCSDIR%%/html/script-defaultprototypes-prototypes-h.html
+%%DOCSDIR%%/html/script-defaultprototypes.html
+%%DOCSDIR%%/html/script-helloscript-main-cpp.html
+%%DOCSDIR%%/html/script-helloscript.html
+%%DOCSDIR%%/html/script-tetrix-main-cpp.html
+%%DOCSDIR%%/html/script-tetrix-tetrix-qrc.html
+%%DOCSDIR%%/html/script-tetrix-tetrixboard-cpp.html
+%%DOCSDIR%%/html/script-tetrix-tetrixboard-h.html
+%%DOCSDIR%%/html/script-tetrix-tetrixboard-js.html
+%%DOCSDIR%%/html/script-tetrix-tetrixpiece-js.html
+%%DOCSDIR%%/html/script-tetrix-tetrixwindow-js.html
+%%DOCSDIR%%/html/script-tetrix.html
+%%DOCSDIR%%/html/script.html
+%%DOCSDIR%%/html/scripting.html
 %%DOCSDIR%%/html/session.html
 %%DOCSDIR%%/html/shared.html
 %%DOCSDIR%%/html/signalsandslots.html
@@ -3338,7 +3634,24 @@
 %%DOCSDIR%%/html/sql-cachedtable-tableeditor-cpp.html
 %%DOCSDIR%%/html/sql-cachedtable-tableeditor-h.html
 %%DOCSDIR%%/html/sql-cachedtable.html
+%%DOCSDIR%%/html/sql-drilldown-drilldown-qrc.html
+%%DOCSDIR%%/html/sql-drilldown-imageitem-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-imageitem-h.html
+%%DOCSDIR%%/html/sql-drilldown-informationwindow-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-informationwindow-h.html
+%%DOCSDIR%%/html/sql-drilldown-main-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-view-cpp.html
+%%DOCSDIR%%/html/sql-drilldown-view-h.html
+%%DOCSDIR%%/html/sql-drilldown.html
 %%DOCSDIR%%/html/sql-driver.html
+%%DOCSDIR%%/html/sql-masterdetail-database-h.html
+%%DOCSDIR%%/html/sql-masterdetail-dialog-cpp.html
+%%DOCSDIR%%/html/sql-masterdetail-dialog-h.html
+%%DOCSDIR%%/html/sql-masterdetail-main-cpp.html
+%%DOCSDIR%%/html/sql-masterdetail-mainwindow-cpp.html
+%%DOCSDIR%%/html/sql-masterdetail-mainwindow-h.html
+%%DOCSDIR%%/html/sql-masterdetail-masterdetail-qrc.html
+%%DOCSDIR%%/html/sql-masterdetail.html
 %%DOCSDIR%%/html/sql-querymodel-customsqlmodel-cpp.html
 %%DOCSDIR%%/html/sql-querymodel-customsqlmodel-h.html
 %%DOCSDIR%%/html/sql-querymodel-editablesqlmodel-cpp.html
@@ -3350,7 +3663,9 @@
 %%DOCSDIR%%/html/sql-tablemodel-tablemodel-cpp.html
 %%DOCSDIR%%/html/sql-tablemodel.html
 %%DOCSDIR%%/html/stylesheet.html
+%%DOCSDIR%%/html/supported-platforms.html
 %%DOCSDIR%%/html/templates.html
+%%DOCSDIR%%/html/text-processing.html
 %%DOCSDIR%%/html/text.html
 %%DOCSDIR%%/html/thread.html
 %%DOCSDIR%%/html/threads-mandelbrot-main-cpp.html
@@ -3386,6 +3701,13 @@
 %%DOCSDIR%%/html/tools-customcompleter-textedit-cpp.html
 %%DOCSDIR%%/html/tools-customcompleter-textedit-h.html
 %%DOCSDIR%%/html/tools-customcompleter.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-echointerface-h.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-echowindow-cpp.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-echowindow-h.html
+%%DOCSDIR%%/html/tools-echoplugin-echowindow-main-cpp.html
+%%DOCSDIR%%/html/tools-echoplugin-plugin-echoplugin-cpp.html
+%%DOCSDIR%%/html/tools-echoplugin-plugin-echoplugin-h.html
+%%DOCSDIR%%/html/tools-echoplugin.html
 %%DOCSDIR%%/html/tools-i18n-i18n-qrc.html
 %%DOCSDIR%%/html/tools-i18n-languagechooser-cpp.html
 %%DOCSDIR%%/html/tools-i18n-languagechooser-h.html
@@ -3408,15 +3730,6 @@
 %%DOCSDIR%%/html/tools-plugandpaintplugins-extrafilters-extrafiltersplugin-cpp.html
 %%DOCSDIR%%/html/tools-plugandpaintplugins-extrafilters-extrafiltersplugin-h.html
 %%DOCSDIR%%/html/tools-plugandpaintplugins-extrafilters.html
-%%DOCSDIR%%/html/tools-qtdemo-displayshape-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-displayshape-h.html
-%%DOCSDIR%%/html/tools-qtdemo-displaywidget-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-displaywidget-h.html
-%%DOCSDIR%%/html/tools-qtdemo-launcher-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-launcher-h.html
-%%DOCSDIR%%/html/tools-qtdemo-main-cpp.html
-%%DOCSDIR%%/html/tools-qtdemo-qtdemo-qrc.html
-%%DOCSDIR%%/html/tools-qtdemo.html
 %%DOCSDIR%%/html/tools-regexp-main-cpp.html
 %%DOCSDIR%%/html/tools-regexp-regexpdialog-cpp.html
 %%DOCSDIR%%/html/tools-regexp-regexpdialog-h.html
@@ -3431,6 +3744,32 @@
 %%DOCSDIR%%/html/tools-settingseditor-variantdelegate-cpp.html
 %%DOCSDIR%%/html/tools-settingseditor-variantdelegate-h.html
 %%DOCSDIR%%/html/tools-settingseditor.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyle-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyle-h.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyleplugin-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-plugin-simplestyleplugin-h.html
+%%DOCSDIR%%/html/tools-styleplugin-stylewindow-main-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-stylewindow-stylewindow-cpp.html
+%%DOCSDIR%%/html/tools-styleplugin-stylewindow-stylewindow-h.html
+%%DOCSDIR%%/html/tools-styleplugin.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-main-cpp.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-mainwindow-cpp.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-mainwindow-h.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-treemodelcompleter-cpp.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-treemodelcompleter-h.html
+%%DOCSDIR%%/html/tools-treemodelcompleter-treemodelcompleter-qrc.html
+%%DOCSDIR%%/html/tools-treemodelcompleter.html
+%%DOCSDIR%%/html/tools-undoframework-commands-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-commands-h.html
+%%DOCSDIR%%/html/tools-undoframework-diagramitem-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-diagramitem-h.html
+%%DOCSDIR%%/html/tools-undoframework-diagramscene-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-diagramscene-h.html
+%%DOCSDIR%%/html/tools-undoframework-main-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-mainwindow-cpp.html
+%%DOCSDIR%%/html/tools-undoframework-mainwindow-h.html
+%%DOCSDIR%%/html/tools-undoframework-undoframework-qrc.html
+%%DOCSDIR%%/html/tools-undoframework.html
 %%DOCSDIR%%/html/tools.html
 %%DOCSDIR%%/html/topics.html
 %%DOCSDIR%%/html/trademarks.html
@@ -3511,6 +3850,10 @@
 %%DOCSDIR%%/html/widgets-calculator-calculator-h.html
 %%DOCSDIR%%/html/widgets-calculator-main-cpp.html
 %%DOCSDIR%%/html/widgets-calculator.html
+%%DOCSDIR%%/html/widgets-calendarwidget-main-cpp.html
+%%DOCSDIR%%/html/widgets-calendarwidget-window-cpp.html
+%%DOCSDIR%%/html/widgets-calendarwidget-window-h.html
+%%DOCSDIR%%/html/widgets-calendarwidget.html
 %%DOCSDIR%%/html/widgets-charactermap-characterwidget-cpp.html
 %%DOCSDIR%%/html/widgets-charactermap-characterwidget-h.html
 %%DOCSDIR%%/html/widgets-charactermap-main-cpp.html
@@ -3582,6 +3925,14 @@
 %%DOCSDIR%%/html/widgets-stylesheet-stylesheeteditor-cpp.html
 %%DOCSDIR%%/html/widgets-stylesheet-stylesheeteditor-h.html
 %%DOCSDIR%%/html/widgets-stylesheet.html
+%%DOCSDIR%%/html/widgets-tablet-main-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-mainwindow-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-mainwindow-h.html
+%%DOCSDIR%%/html/widgets-tablet-tabletapplication-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-tabletapplication-h.html
+%%DOCSDIR%%/html/widgets-tablet-tabletcanvas-cpp.html
+%%DOCSDIR%%/html/widgets-tablet-tabletcanvas-h.html
+%%DOCSDIR%%/html/widgets-tablet.html
 %%DOCSDIR%%/html/widgets-tetrix-main-cpp.html
 %%DOCSDIR%%/html/widgets-tetrix-tetrixboard-cpp.html
 %%DOCSDIR%%/html/widgets-tetrix-tetrixboard-h.html
@@ -3616,6 +3967,10 @@
 %%DOCSDIR%%/html/xml-dombookmarks-xbeltree-cpp.html
 %%DOCSDIR%%/html/xml-dombookmarks-xbeltree-h.html
 %%DOCSDIR%%/html/xml-dombookmarks.html
+%%DOCSDIR%%/html/xml-rsslisting-main-cpp.html
+%%DOCSDIR%%/html/xml-rsslisting-rsslisting-cpp.html
+%%DOCSDIR%%/html/xml-rsslisting-rsslisting-h.html
+%%DOCSDIR%%/html/xml-rsslisting.html
 %%DOCSDIR%%/html/xml-saxbookmarks-main-cpp.html
 %%DOCSDIR%%/html/xml-saxbookmarks-mainwindow-cpp.html
 %%DOCSDIR%%/html/xml-saxbookmarks-mainwindow-h.html
@@ -3624,7 +3979,17 @@
 %%DOCSDIR%%/html/xml-saxbookmarks-xbelhandler-cpp.html
 %%DOCSDIR%%/html/xml-saxbookmarks-xbelhandler-h.html
 %%DOCSDIR%%/html/xml-saxbookmarks.html
+%%DOCSDIR%%/html/xml-streambookmarks-main-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-mainwindow-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-mainwindow-h.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelreader-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelreader-h.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelwriter-cpp.html
+%%DOCSDIR%%/html/xml-streambookmarks-xbelwriter-h.html
+%%DOCSDIR%%/html/xml-streambookmarks.html
 %%DOCSDIR%%/html/xml-tools.html
+%%DOCSDIR%%/html/xml-xmlstreamlint-main-cpp.html
+%%DOCSDIR%%/html/xml-xmlstreamlint.html
 @dirrm %%DOCSDIR%%/html/images
 @dirrm %%DOCSDIR%%/html
 @dirrm %%DOCSDIR%%
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index d09d18a66c1e..e54ca0676657 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qtconfig
-PORTVERSION=	4.2.3
-PORTREVISION=	2
+PORTVERSION=	${QT4_VERSION}
+PORTREVISION=0
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,26 +18,13 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt graphical configuration utility
 
-BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
-		qmake-qt4:${PORTSDIR}/devel/qmake4 \
-		rcc:${PORTSDIR}/devel/qt4-rcc \
-		uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS=	Qt3Support:${PORTSDIR}/devel/qt4-qt3support \
-		QtCore:${PORTSDIR}/devel/qt4-corelib
-
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake moc rcc uic qt3support corelib
+QT_NONSTANDARD=	yes
+QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	-fast -no-exceptions \
-		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX}  \
-		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-		-confirm-license
-
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/misc/qt4-qtconfig/distinfo b/misc/qt4-qtconfig/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/misc/qt4-qtconfig/distinfo
+++ b/misc/qt4-qtconfig/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e88c8c031f26..b1452648e0a5 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	qtdemo
-PORTVERSION=	4.2.3
-PORTREVISION=	1
+PORTVERSION=	${QT4_VERSION}
+PORTREVISION=0
 CATEGORIES?=	misc
 MASTER_SITES=	${MASTER_SITE_QT}
 PKGNAMEPREFIX=	qt4-
@@ -18,36 +18,14 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt demonstration and example programs
 
-BUILD_DEPENDS=	moc-qt4:${PORTSDIR}/devel/qt4-moc \
-		qmake-qt4:${PORTSDIR}/devel/qmake4 \
-		rcc:${PORTSDIR}/devel/qt4-rcc \
-		uic-qt4:${PORTSDIR}/devel/qt4-uic
-LIB_DEPENDS=	QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
-		QtCore:${PORTSDIR}/devel/qt4-corelib \
-		QtDBus:${PORTSDIR}/devel/dbus-qt4 \
-		QtDesigner:${PORTSDIR}/devel/qt4-designer \
-		QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
-		QtNetwork:${PORTSDIR}/net/qt4-network \
-		QtOpenGL:${PORTSDIR}/x11/qt4-opengl \
-		QtSql:${PORTSDIR}/databases/qt4-sql \
-		QtSvg:${PORTSDIR}/graphics/qt4-svg \
-		QtTest:${PORTSDIR}/devel/qt4-qtestlib \
-		QtXml:${PORTSDIR}/textproc/qt4-xml
-RUN_DEPENDS=	qt4-imageformats>=4.2.3:${PORTSDIR}/graphics/qt4-imageformats
-
-CONFLICTS=	linguist-0.* qt-2.* qt-3.0.* \
-		qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
-		xfmail-1.5.5_[1-2]
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake moc rcc uic assistantclient corelib designer gui network opengl\
+		sql svg qtestlib xml imageformats dbus script
+QT_NONSTANDARD=	yes
+QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
 
-CONFIGURE_ARGS=	-fast -no-exceptions \
-		-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-		-qt-gif -release -system-libjpeg -system-libpng \
-		-system-zlib -no-nas-sound -prefix ${PREFIX}  \
-		-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-		-confirm-license
-
 ALL_TARGET=	first
 CONFIGURE_ENV?=	QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
 MAKE_ENV?=	QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/misc/qt4-qtdemo/distinfo b/misc/qt4-qtdemo/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/misc/qt4-qtdemo/distinfo
+++ b/misc/qt4-qtdemo/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index 7851ae7cf0c7..65e2f3cd80eb 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -73,14 +73,6 @@ share/qt4/demos/composition/composition.pro
 share/qt4/demos/composition/composition.qrc
 share/qt4/demos/composition/flower_2.png
 share/qt4/demos/composition/main.cpp
-share/qt4/demos/dbus-viewer/dbus-viewer
-share/qt4/demos/dbus-viewer/dbus-viewer.debug
-share/qt4/demos/dbus-viewer/dbus-viewer.pro
-share/qt4/demos/dbus-viewer/main.cpp
-share/qt4/demos/dbus-viewer/qdbusmodel.cpp
-share/qt4/demos/dbus-viewer/qdbusmodel.h
-share/qt4/demos/dbus-viewer/qdbusviewer.cpp
-share/qt4/demos/dbus-viewer/qdbusviewer.h
 share/qt4/demos/deform/deform
 share/qt4/demos/deform/deform.debug
 share/qt4/demos/deform/deform.pro
@@ -129,6 +121,56 @@ share/qt4/demos/pathstroke/pathstroke.h
 share/qt4/demos/pathstroke/pathstroke.html
 share/qt4/demos/pathstroke/pathstroke.pro
 share/qt4/demos/pathstroke/pathstroke.qrc
+share/qt4/demos/qtdemo/colors.cpp
+share/qt4/demos/qtdemo/colors.h
+share/qt4/demos/qtdemo/demoitem.cpp
+share/qt4/demos/qtdemo/demoitem.h
+share/qt4/demos/qtdemo/demoitemanimation.cpp
+share/qt4/demos/qtdemo/demoitemanimation.h
+share/qt4/demos/qtdemo/demoscene.cpp
+share/qt4/demos/qtdemo/demoscene.h
+share/qt4/demos/qtdemo/demotextitem.cpp
+share/qt4/demos/qtdemo/demotextitem.h
+share/qt4/demos/qtdemo/dockitem.cpp
+share/qt4/demos/qtdemo/dockitem.h
+share/qt4/demos/qtdemo/examplecontent.cpp
+share/qt4/demos/qtdemo/examplecontent.h
+share/qt4/demos/qtdemo/guide.cpp
+share/qt4/demos/qtdemo/guide.h
+share/qt4/demos/qtdemo/guidecircle.cpp
+share/qt4/demos/qtdemo/guidecircle.h
+share/qt4/demos/qtdemo/guideline.cpp
+share/qt4/demos/qtdemo/guideline.h
+share/qt4/demos/qtdemo/headingitem.cpp
+share/qt4/demos/qtdemo/headingitem.h
+share/qt4/demos/qtdemo/imageitem.cpp
+share/qt4/demos/qtdemo/imageitem.h
+share/qt4/demos/qtdemo/images/demobg.png
+share/qt4/demos/qtdemo/images/qtlogo_small.png
+share/qt4/demos/qtdemo/images/trolltech-logo.png
+share/qt4/demos/qtdemo/itemcircleanimation.cpp
+share/qt4/demos/qtdemo/itemcircleanimation.h
+share/qt4/demos/qtdemo/letteritem.cpp
+share/qt4/demos/qtdemo/letteritem.h
+share/qt4/demos/qtdemo/main.cpp
+share/qt4/demos/qtdemo/mainwindow.cpp
+share/qt4/demos/qtdemo/mainwindow.h
+share/qt4/demos/qtdemo/menucontent.cpp
+share/qt4/demos/qtdemo/menucontent.h
+share/qt4/demos/qtdemo/menumanager.cpp
+share/qt4/demos/qtdemo/menumanager.h
+share/qt4/demos/qtdemo/qtdemo.icns
+share/qt4/demos/qtdemo/qtdemo.ico
+share/qt4/demos/qtdemo/qtdemo.pro
+share/qt4/demos/qtdemo/qtdemo.qrc
+share/qt4/demos/qtdemo/qtdemo.rc
+share/qt4/demos/qtdemo/scanitem.cpp
+share/qt4/demos/qtdemo/scanitem.h
+share/qt4/demos/qtdemo/score.cpp
+share/qt4/demos/qtdemo/score.h
+share/qt4/demos/qtdemo/textbutton.cpp
+share/qt4/demos/qtdemo/textbutton.h
+share/qt4/demos/qtdemo/xml/examples.xml
 share/qt4/demos/shared/arthurstyle.cpp
 share/qt4/demos/shared/arthurstyle.h
 share/qt4/demos/shared/arthurwidgets.cpp
@@ -247,6 +289,17 @@ share/qt4/demos/textedit/textedit.doc
 share/qt4/demos/textedit/textedit.h
 share/qt4/demos/textedit/textedit.pro
 share/qt4/demos/textedit/textedit.qrc
+share/qt4/demos/undo/commands.cpp
+share/qt4/demos/undo/commands.h
+share/qt4/demos/undo/document.cpp
+share/qt4/demos/undo/document.h
+share/qt4/demos/undo/main.cpp
+share/qt4/demos/undo/mainwindow.cpp
+share/qt4/demos/undo/mainwindow.h
+share/qt4/demos/undo/undo
+share/qt4/demos/undo/undo.debug
+share/qt4/demos/undo/undo.pro
+share/qt4/demos/undo/undo.qrc
 share/qt4/examples/README
 share/qt4/examples/assistant/assistant.pro
 share/qt4/examples/assistant/simpletextviewer/documentation/about.txt
@@ -340,6 +393,12 @@ share/qt4/examples/desktop/systray/systray.qrc
 share/qt4/examples/desktop/systray/window.cpp
 share/qt4/examples/desktop/systray/window.h
 share/qt4/examples/dialogs/README
+share/qt4/examples/dialogs/classwizard/classwizard
+share/qt4/examples/dialogs/classwizard/classwizard.cpp
+share/qt4/examples/dialogs/classwizard/classwizard.debug
+share/qt4/examples/dialogs/classwizard/classwizard.h
+share/qt4/examples/dialogs/classwizard/classwizard.pro
+share/qt4/examples/dialogs/classwizard/main.cpp
 share/qt4/examples/dialogs/configdialog/configdialog
 share/qt4/examples/dialogs/configdialog/configdialog.cpp
 share/qt4/examples/dialogs/configdialog/configdialog.debug
@@ -365,6 +424,12 @@ share/qt4/examples/dialogs/findfiles/findfiles.pro
 share/qt4/examples/dialogs/findfiles/main.cpp
 share/qt4/examples/dialogs/findfiles/window.cpp
 share/qt4/examples/dialogs/findfiles/window.h
+share/qt4/examples/dialogs/licensewizard/licensewizard
+share/qt4/examples/dialogs/licensewizard/licensewizard.cpp
+share/qt4/examples/dialogs/licensewizard/licensewizard.debug
+share/qt4/examples/dialogs/licensewizard/licensewizard.h
+share/qt4/examples/dialogs/licensewizard/licensewizard.pro
+share/qt4/examples/dialogs/licensewizard/main.cpp
 share/qt4/examples/dialogs/standarddialogs/dialog.cpp
 share/qt4/examples/dialogs/standarddialogs/dialog.h
 share/qt4/examples/dialogs/standarddialogs/main.cpp
@@ -377,6 +442,10 @@ share/qt4/examples/dialogs/tabdialog/tabdialog.cpp
 share/qt4/examples/dialogs/tabdialog/tabdialog.debug
 share/qt4/examples/dialogs/tabdialog/tabdialog.h
 share/qt4/examples/dialogs/tabdialog/tabdialog.pro
+share/qt4/examples/dialogs/trivialwizard/trivialwizard
+share/qt4/examples/dialogs/trivialwizard/trivialwizard.cpp
+share/qt4/examples/dialogs/trivialwizard/trivialwizard.debug
+share/qt4/examples/dialogs/trivialwizard/trivialwizard.pro
 share/qt4/examples/draganddrop/README
 share/qt4/examples/draganddrop/draganddrop.pro
 share/qt4/examples/draganddrop/draggableicons/draggableicons
@@ -439,6 +508,36 @@ share/qt4/examples/graphicsview/collidingmice/main.cpp
 share/qt4/examples/graphicsview/collidingmice/mice.qrc
 share/qt4/examples/graphicsview/collidingmice/mouse.cpp
 share/qt4/examples/graphicsview/collidingmice/mouse.h
+share/qt4/examples/graphicsview/diagramscene/arrow.cpp
+share/qt4/examples/graphicsview/diagramscene/arrow.h
+share/qt4/examples/graphicsview/diagramscene/diagramitem.cpp
+share/qt4/examples/graphicsview/diagramscene/diagramitem.h
+share/qt4/examples/graphicsview/diagramscene/diagramscene
+share/qt4/examples/graphicsview/diagramscene/diagramscene.cpp
+share/qt4/examples/graphicsview/diagramscene/diagramscene.debug
+share/qt4/examples/graphicsview/diagramscene/diagramscene.h
+share/qt4/examples/graphicsview/diagramscene/diagramscene.pro
+share/qt4/examples/graphicsview/diagramscene/diagramscene.qrc
+share/qt4/examples/graphicsview/diagramscene/diagramtextitem.cpp
+share/qt4/examples/graphicsview/diagramscene/diagramtextitem.h
+share/qt4/examples/graphicsview/diagramscene/images/background1.png
+share/qt4/examples/graphicsview/diagramscene/images/background2.png
+share/qt4/examples/graphicsview/diagramscene/images/background3.png
+share/qt4/examples/graphicsview/diagramscene/images/background4.png
+share/qt4/examples/graphicsview/diagramscene/images/bold.png
+share/qt4/examples/graphicsview/diagramscene/images/bringtofront.png
+share/qt4/examples/graphicsview/diagramscene/images/delete.png
+share/qt4/examples/graphicsview/diagramscene/images/floodfill.png
+share/qt4/examples/graphicsview/diagramscene/images/italic.png
+share/qt4/examples/graphicsview/diagramscene/images/linecolor.png
+share/qt4/examples/graphicsview/diagramscene/images/linepointer.png
+share/qt4/examples/graphicsview/diagramscene/images/pointer.png
+share/qt4/examples/graphicsview/diagramscene/images/sendtoback.png
+share/qt4/examples/graphicsview/diagramscene/images/textpointer.png
+share/qt4/examples/graphicsview/diagramscene/images/underline.png
+share/qt4/examples/graphicsview/diagramscene/main.cpp
+share/qt4/examples/graphicsview/diagramscene/mainwindow.cpp
+share/qt4/examples/graphicsview/diagramscene/mainwindow.h
 share/qt4/examples/graphicsview/dragdroprobot/coloritem.cpp
 share/qt4/examples/graphicsview/dragdroprobot/coloritem.h
 share/qt4/examples/graphicsview/dragdroprobot/dragdroprobot
@@ -673,6 +772,14 @@ share/qt4/examples/itemviews/chart/mydata.cht
 share/qt4/examples/itemviews/chart/pieview.cpp
 share/qt4/examples/itemviews/chart/pieview.h
 share/qt4/examples/itemviews/chart/qtdata.cht
+share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory
+share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.debug
+share/qt4/examples/itemviews/coloreditorfactory/coloreditorfactory.pro
+share/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.cpp
+share/qt4/examples/itemviews/coloreditorfactory/colorlisteditor.h
+share/qt4/examples/itemviews/coloreditorfactory/main.cpp
+share/qt4/examples/itemviews/coloreditorfactory/window.cpp
+share/qt4/examples/itemviews/coloreditorfactory/window.h
 share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel
 share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.debug
 share/qt4/examples/itemviews/customsortfiltermodel/customsortfiltermodel.pro
@@ -730,12 +837,28 @@ share/qt4/examples/itemviews/simpletreemodel/treeitem.cpp
 share/qt4/examples/itemviews/simpletreemodel/treeitem.h
 share/qt4/examples/itemviews/simpletreemodel/treemodel.cpp
 share/qt4/examples/itemviews/simpletreemodel/treemodel.h
+share/qt4/examples/itemviews/simplewidgetmapper/main.cpp
+share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper
+share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.debug
+share/qt4/examples/itemviews/simplewidgetmapper/simplewidgetmapper.pro
+share/qt4/examples/itemviews/simplewidgetmapper/window.cpp
+share/qt4/examples/itemviews/simplewidgetmapper/window.h
 share/qt4/examples/itemviews/spinboxdelegate/delegate.cpp
 share/qt4/examples/itemviews/spinboxdelegate/delegate.h
 share/qt4/examples/itemviews/spinboxdelegate/main.cpp
 share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate
 share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.debug
 share/qt4/examples/itemviews/spinboxdelegate/spinboxdelegate.pro
+share/qt4/examples/itemviews/stardelegate/main.cpp
+share/qt4/examples/itemviews/stardelegate/stardelegate
+share/qt4/examples/itemviews/stardelegate/stardelegate.cpp
+share/qt4/examples/itemviews/stardelegate/stardelegate.debug
+share/qt4/examples/itemviews/stardelegate/stardelegate.h
+share/qt4/examples/itemviews/stardelegate/stardelegate.pro
+share/qt4/examples/itemviews/stardelegate/stareditor.cpp
+share/qt4/examples/itemviews/stardelegate/stareditor.h
+share/qt4/examples/itemviews/stardelegate/starrating.cpp
+share/qt4/examples/itemviews/stardelegate/starrating.h
 share/qt4/examples/layouts/README
 share/qt4/examples/layouts/basiclayouts/basiclayouts
 share/qt4/examples/layouts/basiclayouts/basiclayouts.debug
@@ -913,6 +1036,7 @@ share/qt4/examples/network/ftp/images/cdtoparent.png
 share/qt4/examples/network/ftp/images/dir.png
 share/qt4/examples/network/ftp/images/file.png
 share/qt4/examples/network/ftp/main.cpp
+share/qt4/examples/network/http/authenticationdialog.ui
 share/qt4/examples/network/http/http
 share/qt4/examples/network/http/http.debug
 share/qt4/examples/network/http/http.pro
@@ -1246,6 +1370,68 @@ share/qt4/examples/richtext/syntaxhighlighter/mainwindow.h
 share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter
 share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.debug
 share/qt4/examples/richtext/syntaxhighlighter/syntaxhighlighter.pro
+share/qt4/examples/script/README
+share/qt4/examples/script/calculator/calculator
+share/qt4/examples/script/calculator/calculator.debug
+share/qt4/examples/script/calculator/calculator.pro
+share/qt4/examples/script/calculator/calculator.qrc
+share/qt4/examples/script/calculator/main.cpp
+share/qt4/examples/script/context2d/context2d
+share/qt4/examples/script/context2d/context2d.cpp
+share/qt4/examples/script/context2d/context2d.debug
+share/qt4/examples/script/context2d/context2d.h
+share/qt4/examples/script/context2d/context2d.pro
+share/qt4/examples/script/context2d/context2d.qrc
+share/qt4/examples/script/context2d/domimage.cpp
+share/qt4/examples/script/context2d/domimage.h
+share/qt4/examples/script/context2d/main.cpp
+share/qt4/examples/script/context2d/qcontext2dcanvas.cpp
+share/qt4/examples/script/context2d/qcontext2dcanvas.h
+share/qt4/examples/script/context2d/scripts/alpha.js
+share/qt4/examples/script/context2d/scripts/arc.js
+share/qt4/examples/script/context2d/scripts/bezier.js
+share/qt4/examples/script/context2d/scripts/clock.js
+share/qt4/examples/script/context2d/scripts/fill1.js
+share/qt4/examples/script/context2d/scripts/grad.js
+share/qt4/examples/script/context2d/scripts/linecap.js
+share/qt4/examples/script/context2d/scripts/linestye.js
+share/qt4/examples/script/context2d/scripts/moveto.js
+share/qt4/examples/script/context2d/scripts/moveto2.js
+share/qt4/examples/script/context2d/scripts/pacman.js
+share/qt4/examples/script/context2d/scripts/plasma.js
+share/qt4/examples/script/context2d/scripts/pong.js
+share/qt4/examples/script/context2d/scripts/quad.js
+share/qt4/examples/script/context2d/scripts/rgba.js
+share/qt4/examples/script/context2d/scripts/rotate.js
+share/qt4/examples/script/context2d/scripts/scale.js
+share/qt4/examples/script/context2d/scripts/stroke1.js
+share/qt4/examples/script/context2d/scripts/translate.js
+share/qt4/examples/script/context2d/window.cpp
+share/qt4/examples/script/context2d/window.h
+share/qt4/examples/script/defaultprototypes/defaultprototypes
+share/qt4/examples/script/defaultprototypes/defaultprototypes.debug
+share/qt4/examples/script/defaultprototypes/defaultprototypes.pro
+share/qt4/examples/script/defaultprototypes/defaultprototypes.qrc
+share/qt4/examples/script/defaultprototypes/main.cpp
+share/qt4/examples/script/defaultprototypes/prototypes.cpp
+share/qt4/examples/script/defaultprototypes/prototypes.h
+share/qt4/examples/script/helloscript/helloscript
+share/qt4/examples/script/helloscript/helloscript.debug
+share/qt4/examples/script/helloscript/helloscript.pro
+share/qt4/examples/script/helloscript/main.cpp
+share/qt4/examples/script/qscript/main.cpp
+share/qt4/examples/script/qscript/qscript
+share/qt4/examples/script/qscript/qscript.debug
+share/qt4/examples/script/qscript/qscript.pro
+share/qt4/examples/script/script.pro
+share/qt4/examples/script/tetrix/main.cpp
+share/qt4/examples/script/tetrix/tetrix
+share/qt4/examples/script/tetrix/tetrix.debug
+share/qt4/examples/script/tetrix/tetrix.pro
+share/qt4/examples/script/tetrix/tetrix.qrc
+share/qt4/examples/script/tetrix/tetrixboard.cpp
+share/qt4/examples/script/tetrix/tetrixboard.h
+share/qt4/examples/script/tetrix/tetrixwindow.ui
 share/qt4/examples/sql/README
 share/qt4/examples/sql/cachedtable/cachedtable
 share/qt4/examples/sql/cachedtable/cachedtable.debug
@@ -1254,6 +1440,27 @@ share/qt4/examples/sql/cachedtable/main.cpp
 share/qt4/examples/sql/cachedtable/tableeditor.cpp
 share/qt4/examples/sql/cachedtable/tableeditor.h
 share/qt4/examples/sql/connection.h
+share/qt4/examples/sql/drilldown/drilldown
+share/qt4/examples/sql/drilldown/drilldown.debug
+share/qt4/examples/sql/drilldown/drilldown.pro
+share/qt4/examples/sql/drilldown/drilldown.qrc
+share/qt4/examples/sql/drilldown/imageitem.cpp
+share/qt4/examples/sql/drilldown/imageitem.h
+share/qt4/examples/sql/drilldown/informationwindow.cpp
+share/qt4/examples/sql/drilldown/informationwindow.h
+share/qt4/examples/sql/drilldown/main.cpp
+share/qt4/examples/sql/drilldown/view.cpp
+share/qt4/examples/sql/drilldown/view.h
+share/qt4/examples/sql/masterdetail/database.h
+share/qt4/examples/sql/masterdetail/dialog.cpp
+share/qt4/examples/sql/masterdetail/dialog.h
+share/qt4/examples/sql/masterdetail/main.cpp
+share/qt4/examples/sql/masterdetail/mainwindow.cpp
+share/qt4/examples/sql/masterdetail/mainwindow.h
+share/qt4/examples/sql/masterdetail/masterdetail
+share/qt4/examples/sql/masterdetail/masterdetail.debug
+share/qt4/examples/sql/masterdetail/masterdetail.pro
+share/qt4/examples/sql/masterdetail/masterdetail.qrc
 share/qt4/examples/sql/querymodel/customsqlmodel.cpp
 share/qt4/examples/sql/querymodel/customsqlmodel.h
 share/qt4/examples/sql/querymodel/editablesqlmodel.cpp
@@ -1325,6 +1532,18 @@ share/qt4/examples/tools/customcompleter/mainwindow.h
 share/qt4/examples/tools/customcompleter/resources/wordlist.txt
 share/qt4/examples/tools/customcompleter/textedit.cpp
 share/qt4/examples/tools/customcompleter/textedit.h
+share/qt4/examples/tools/echoplugin/echoplugin.pro
+share/qt4/examples/tools/echoplugin/echowindow/echointerface.h
+share/qt4/examples/tools/echoplugin/echowindow/echoplugin
+share/qt4/examples/tools/echoplugin/echowindow/echowindow.cpp
+share/qt4/examples/tools/echoplugin/echowindow/echowindow.h
+share/qt4/examples/tools/echoplugin/echowindow/echowindow.pro
+share/qt4/examples/tools/echoplugin/echowindow/main.cpp
+share/qt4/examples/tools/echoplugin/plugin/echoplugin.cpp
+share/qt4/examples/tools/echoplugin/plugin/echoplugin.h
+share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
+share/qt4/examples/tools/echoplugin/plugin/libechoplugin.so.debug
+share/qt4/examples/tools/echoplugin/plugin/plugin.pro
 share/qt4/examples/tools/i18n/i18n
 share/qt4/examples/tools/i18n/i18n.debug
 share/qt4/examples/tools/i18n/i18n.pro
@@ -1383,22 +1602,6 @@ share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafilters.pro
 share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.cpp
 share/qt4/examples/tools/plugandpaintplugins/extrafilters/extrafiltersplugin.h
 share/qt4/examples/tools/plugandpaintplugins/plugandpaintplugins.pro
-share/qt4/examples/tools/qtdemo/demos.xml
-share/qt4/examples/tools/qtdemo/displayshape.cpp
-share/qt4/examples/tools/qtdemo/displayshape.h
-share/qt4/examples/tools/qtdemo/displaywidget.cpp
-share/qt4/examples/tools/qtdemo/displaywidget.h
-share/qt4/examples/tools/qtdemo/examples.xml
-share/qt4/examples/tools/qtdemo/images/qt4-logo.png
-share/qt4/examples/tools/qtdemo/images/trolltech-logo.png
-share/qt4/examples/tools/qtdemo/launcher.cpp
-share/qt4/examples/tools/qtdemo/launcher.h
-share/qt4/examples/tools/qtdemo/main.cpp
-share/qt4/examples/tools/qtdemo/qtdemo.icns
-share/qt4/examples/tools/qtdemo/qtdemo.ico
-share/qt4/examples/tools/qtdemo/qtdemo.pro
-share/qt4/examples/tools/qtdemo/qtdemo.qrc
-share/qt4/examples/tools/qtdemo/qtdemo.rc
 share/qt4/examples/tools/regexp/main.cpp
 share/qt4/examples/tools/regexp/regexp
 share/qt4/examples/tools/regexp/regexp.debug
@@ -1419,7 +1622,43 @@ share/qt4/examples/tools/settingseditor/settingstree.cpp
 share/qt4/examples/tools/settingseditor/settingstree.h
 share/qt4/examples/tools/settingseditor/variantdelegate.cpp
 share/qt4/examples/tools/settingseditor/variantdelegate.h
+share/qt4/examples/tools/styleplugin/plugin/plugin.pro
+share/qt4/examples/tools/styleplugin/plugin/simplestyle.cpp
+share/qt4/examples/tools/styleplugin/plugin/simplestyle.h
+share/qt4/examples/tools/styleplugin/plugin/simplestyleplugin.cpp
+share/qt4/examples/tools/styleplugin/plugin/simplestyleplugin.h
+share/qt4/examples/tools/styleplugin/styleplugin.pro
+share/qt4/examples/tools/styleplugin/stylewindow/main.cpp
+share/qt4/examples/tools/styleplugin/stylewindow/styleplugin
+share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so
+share/qt4/examples/tools/styleplugin/stylewindow/styles/libsimplestyleplugin.so.debug
+share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.cpp
+share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.h
+share/qt4/examples/tools/styleplugin/stylewindow/stylewindow.pro
 share/qt4/examples/tools/tools.pro
+share/qt4/examples/tools/treemodelcompleter/main.cpp
+share/qt4/examples/tools/treemodelcompleter/mainwindow.cpp
+share/qt4/examples/tools/treemodelcompleter/mainwindow.h
+share/qt4/examples/tools/treemodelcompleter/resources/treemodel.txt
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.cpp
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.debug
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.h
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.pro
+share/qt4/examples/tools/treemodelcompleter/treemodelcompleter.qrc
+share/qt4/examples/tools/undoframework/commands.cpp
+share/qt4/examples/tools/undoframework/commands.h
+share/qt4/examples/tools/undoframework/diagramitem.cpp
+share/qt4/examples/tools/undoframework/diagramitem.h
+share/qt4/examples/tools/undoframework/diagramscene.cpp
+share/qt4/examples/tools/undoframework/diagramscene.h
+share/qt4/examples/tools/undoframework/main.cpp
+share/qt4/examples/tools/undoframework/mainwindow.cpp
+share/qt4/examples/tools/undoframework/mainwindow.h
+share/qt4/examples/tools/undoframework/undoframework
+share/qt4/examples/tools/undoframework/undoframework.debug
+share/qt4/examples/tools/undoframework/undoframework.pro
+share/qt4/examples/tools/undoframework/undoframework.qrc
 share/qt4/examples/tutorial/README
 share/qt4/examples/tutorial/t1/main.cpp
 share/qt4/examples/tutorial/t1/t1
@@ -1648,6 +1887,16 @@ share/qt4/examples/widgets/stylesheet/stylesheet.qrc
 share/qt4/examples/widgets/stylesheet/stylesheeteditor.cpp
 share/qt4/examples/widgets/stylesheet/stylesheeteditor.h
 share/qt4/examples/widgets/stylesheet/stylesheeteditor.ui
+share/qt4/examples/widgets/tablet/main.cpp
+share/qt4/examples/widgets/tablet/mainwindow.cpp
+share/qt4/examples/widgets/tablet/mainwindow.h
+share/qt4/examples/widgets/tablet/tablet
+share/qt4/examples/widgets/tablet/tablet.debug
+share/qt4/examples/widgets/tablet/tablet.pro
+share/qt4/examples/widgets/tablet/tabletapplication.cpp
+share/qt4/examples/widgets/tablet/tabletapplication.h
+share/qt4/examples/widgets/tablet/tabletcanvas.cpp
+share/qt4/examples/widgets/tablet/tabletcanvas.h
 share/qt4/examples/widgets/tetrix/main.cpp
 share/qt4/examples/widgets/tetrix/tetrix
 share/qt4/examples/widgets/tetrix/tetrix.debug
@@ -1698,6 +1947,12 @@ share/qt4/examples/xml/dombookmarks/mainwindow.cpp
 share/qt4/examples/xml/dombookmarks/mainwindow.h
 share/qt4/examples/xml/dombookmarks/xbeltree.cpp
 share/qt4/examples/xml/dombookmarks/xbeltree.h
+share/qt4/examples/xml/rsslisting/main.cpp
+share/qt4/examples/xml/rsslisting/rsslisting
+share/qt4/examples/xml/rsslisting/rsslisting.cpp
+share/qt4/examples/xml/rsslisting/rsslisting.debug
+share/qt4/examples/xml/rsslisting/rsslisting.h
+share/qt4/examples/xml/rsslisting/rsslisting.pro
 share/qt4/examples/xml/saxbookmarks/frank.xbel
 share/qt4/examples/xml/saxbookmarks/jennifer.xbel
 share/qt4/examples/xml/saxbookmarks/main.cpp
@@ -1710,8 +1965,27 @@ share/qt4/examples/xml/saxbookmarks/xbelgenerator.cpp
 share/qt4/examples/xml/saxbookmarks/xbelgenerator.h
 share/qt4/examples/xml/saxbookmarks/xbelhandler.cpp
 share/qt4/examples/xml/saxbookmarks/xbelhandler.h
+share/qt4/examples/xml/streambookmarks/frank.xbel
+share/qt4/examples/xml/streambookmarks/jennifer.xbel
+share/qt4/examples/xml/streambookmarks/main.cpp
+share/qt4/examples/xml/streambookmarks/mainwindow.cpp
+share/qt4/examples/xml/streambookmarks/mainwindow.h
+share/qt4/examples/xml/streambookmarks/streambookmarks
+share/qt4/examples/xml/streambookmarks/streambookmarks.debug
+share/qt4/examples/xml/streambookmarks/streambookmarks.pro
+share/qt4/examples/xml/streambookmarks/xbelreader.cpp
+share/qt4/examples/xml/streambookmarks/xbelreader.h
+share/qt4/examples/xml/streambookmarks/xbelwriter.cpp
+share/qt4/examples/xml/streambookmarks/xbelwriter.h
 share/qt4/examples/xml/xml.pro
+share/qt4/examples/xml/xmlstreamlint/main.cpp
+share/qt4/examples/xml/xmlstreamlint/xmlstreamlint
+share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.debug
+share/qt4/examples/xml/xmlstreamlint/xmlstreamlint.pro
+@dirrm share/qt4/examples/xml/xmlstreamlint
+@dirrm share/qt4/examples/xml/streambookmarks
 @dirrm share/qt4/examples/xml/saxbookmarks
+@dirrm share/qt4/examples/xml/rsslisting
 @dirrm share/qt4/examples/xml/dombookmarks
 @dirrm share/qt4/examples/xml
 @dirrm share/qt4/examples/widgets/windowflags
@@ -1719,6 +1993,7 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/widgets/tooltips/images
 @dirrm share/qt4/examples/widgets/tooltips
 @dirrm share/qt4/examples/widgets/tetrix
+@dirrm share/qt4/examples/widgets/tablet
 @dirrm share/qt4/examples/widgets/stylesheet
 @dirrm share/qt4/examples/widgets/styles/images
 @dirrm share/qt4/examples/widgets/styles
@@ -1754,11 +2029,16 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/tutorial/t10
 @dirrm share/qt4/examples/tutorial/t1
 @dirrm share/qt4/examples/tutorial
+@dirrm share/qt4/examples/tools/undoframework
+@dirrm share/qt4/examples/tools/treemodelcompleter/resources
+@dirrm share/qt4/examples/tools/treemodelcompleter
+@dirrm share/qt4/examples/tools/styleplugin/stylewindow/styles
+@dirrm share/qt4/examples/tools/styleplugin/stylewindow
+@dirrm share/qt4/examples/tools/styleplugin/plugin
+@dirrm share/qt4/examples/tools/styleplugin
 @dirrm share/qt4/examples/tools/settingseditor/inifiles
 @dirrm share/qt4/examples/tools/settingseditor
 @dirrm share/qt4/examples/tools/regexp
-@dirrm share/qt4/examples/tools/qtdemo/images
-@dirrm share/qt4/examples/tools/qtdemo
 @dirrm share/qt4/examples/tools/plugandpaintplugins/extrafilters
 @dirrm share/qt4/examples/tools/plugandpaintplugins/basictools
 @dirrm share/qt4/examples/tools/plugandpaintplugins
@@ -1766,6 +2046,9 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/tools/plugandpaint
 @dirrm share/qt4/examples/tools/i18n/translations
 @dirrm share/qt4/examples/tools/i18n
+@dirrm share/qt4/examples/tools/echoplugin/plugin
+@dirrm share/qt4/examples/tools/echoplugin/echowindow
+@dirrm share/qt4/examples/tools/echoplugin
 @dirrm share/qt4/examples/tools/customcompleter/resources
 @dirrm share/qt4/examples/tools/customcompleter
 @dirrm share/qt4/examples/tools/completer/resources
@@ -1780,8 +2063,18 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/sql/tablemodel
 @dirrm share/qt4/examples/sql/relationaltablemodel
 @dirrm share/qt4/examples/sql/querymodel
+@dirrm share/qt4/examples/sql/masterdetail
+@dirrm share/qt4/examples/sql/drilldown
 @dirrm share/qt4/examples/sql/cachedtable
 @dirrm share/qt4/examples/sql
+@dirrm share/qt4/examples/script/tetrix
+@dirrm share/qt4/examples/script/qscript
+@dirrm share/qt4/examples/script/helloscript
+@dirrm share/qt4/examples/script/defaultprototypes
+@dirrm share/qt4/examples/script/context2d/scripts
+@dirrm share/qt4/examples/script/context2d
+@dirrm share/qt4/examples/script/calculator
+@dirrm share/qt4/examples/script
 @dirrm share/qt4/examples/richtext/syntaxhighlighter
 @dirrm share/qt4/examples/richtext/orderform
 @dirrm share/qt4/examples/richtext/calendar
@@ -1858,7 +2151,9 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/layouts/borderlayout
 @dirrm share/qt4/examples/layouts/basiclayouts
 @dirrm share/qt4/examples/layouts
+@dirrm share/qt4/examples/itemviews/stardelegate
 @dirrm share/qt4/examples/itemviews/spinboxdelegate
+@dirrm share/qt4/examples/itemviews/simplewidgetmapper
 @dirrm share/qt4/examples/itemviews/simpletreemodel
 @dirrm share/qt4/examples/itemviews/simpledommodel
 @dirrm share/qt4/examples/itemviews/puzzle
@@ -1866,6 +2161,7 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/itemviews/pixelator
 @dirrm share/qt4/examples/itemviews/dirview
 @dirrm share/qt4/examples/itemviews/customsortfiltermodel
+@dirrm share/qt4/examples/itemviews/coloreditorfactory
 @dirrm share/qt4/examples/itemviews/chart
 @dirrm share/qt4/examples/itemviews/basicsortfiltermodel
 @dirrm share/qt4/examples/itemviews
@@ -1885,6 +2181,8 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/graphicsview/elasticnodes
 @dirrm share/qt4/examples/graphicsview/dragdroprobot/images
 @dirrm share/qt4/examples/graphicsview/dragdroprobot
+@dirrm share/qt4/examples/graphicsview/diagramscene/images
+@dirrm share/qt4/examples/graphicsview/diagramscene
 @dirrm share/qt4/examples/graphicsview/collidingmice/images
 @dirrm share/qt4/examples/graphicsview/collidingmice
 @dirrm share/qt4/examples/graphicsview
@@ -1895,12 +2193,15 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/draganddrop/draggableicons/images
 @dirrm share/qt4/examples/draganddrop/draggableicons
 @dirrm share/qt4/examples/draganddrop
+@dirrm share/qt4/examples/dialogs/trivialwizard
 @dirrm share/qt4/examples/dialogs/tabdialog
 @dirrm share/qt4/examples/dialogs/standarddialogs
+@dirrm share/qt4/examples/dialogs/licensewizard
 @dirrm share/qt4/examples/dialogs/findfiles
 @dirrm share/qt4/examples/dialogs/extension
 @dirrm share/qt4/examples/dialogs/configdialog/images
 @dirrm share/qt4/examples/dialogs/configdialog
+@dirrm share/qt4/examples/dialogs/classwizard
 @dirrm share/qt4/examples/dialogs
 @dirrm share/qt4/examples/desktop/systray
 @dirrm share/qt4/examples/desktop/screenshot
@@ -1918,6 +2219,7 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/examples/assistant/simpletextviewer
 @dirrm share/qt4/examples/assistant
 @dirrm share/qt4/examples
+@dirrm share/qt4/demos/undo
 @dirrm share/qt4/demos/textedit/images/win
 @dirrm share/qt4/demos/textedit/images/mac
 @dirrm share/qt4/demos/textedit/images
@@ -1927,13 +2229,15 @@ share/qt4/examples/xml/xml.pro
 @dirrm share/qt4/demos/spreadsheet
 @dirrm share/qt4/demos/shared/images
 @dirrm share/qt4/demos/shared
+@dirrm share/qt4/demos/qtdemo/xml
+@dirrm share/qt4/demos/qtdemo/images
+@dirrm share/qt4/demos/qtdemo
 @dirrm share/qt4/demos/pathstroke
 @dirrm share/qt4/demos/mainwindow
 @dirrm share/qt4/demos/interview/images
 @dirrm share/qt4/demos/interview
 @dirrm share/qt4/demos/gradients
 @dirrm share/qt4/demos/deform
-@dirrm share/qt4/demos/dbus-viewer
 @dirrm share/qt4/demos/composition
 @dirrm share/qt4/demos/chip
 @dirrm share/qt4/demos/books/images