aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Mk/bsd.qt.mk8
-rw-r--r--devel/dbus-qt4/Makefile13
-rw-r--r--devel/qmake4/Makefile9
-rw-r--r--devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff26
-rw-r--r--devel/qmake4/pkg-plist26
-rw-r--r--devel/qt4-designer/pkg-plist2
-rw-r--r--devel/qt4-qdoc3/Makefile31
-rw-r--r--devel/qt4/distinfo4
-rw-r--r--devel/qt4/pkg-plist2
-rw-r--r--misc/qt4-doc/pkg-plist363
-rw-r--r--misc/qt4-l10n/pkg-plist9
-rw-r--r--misc/qt4-qtdemo/pkg-plist72
-rw-r--r--www/qt4-webkit/Makefile8
13 files changed, 486 insertions, 87 deletions
diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 63711d604a59..53890f61eeee 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -44,7 +44,6 @@ CONFIGURE_ENV+= CC="" CXX=""
# Keep in sync with devel/qmake4/files/qconfig.cpp
CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \
- -L${PREFIX}/${QT_LIBDIR_REL} \
-qt-gif -system-libjpeg -system-libpng \
-system-libmng -system-libtiff -system-zlib \
-opensource -confirm-license \
@@ -60,7 +59,9 @@ CONFIGURE_ARGS+=-fast -platform ${QMAKESPEC} \
-translationdir ${PREFIX}/share/qt4/translations \
-sysconfdir ${PREFIX}/etc/xdg \
-examplesdir ${PREFIX}/share/examples/qt4/examples \
- -demosdir ${PREFIX}/share/examples/qt4/demos
+ -demosdir ${PREFIX}/share/examples/qt4/demos \
+ -phonon \
+ -no-phonon-backend
PLIST_SUB+= SHLIB_VER=${QT4_VERSION:C/-.*//} \
SHLIB_SHVER=${QT4_VERSION:R}
@@ -145,9 +146,8 @@ QTCGFLIBS?=
#
# QT4 version
-# Don't forget to update ${PORTSDIR}/devel/qt4/files/patch-configure !
#
-QT4_VERSION?= 4.7.3
+QT4_VERSION?= 4.7.4
_QT_COMPONENTS_ALL= accessible assistant assistant-adp assistantclient \
clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index f0dc2c65a651..882cde4917c5 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -17,7 +17,7 @@ COMMENT= Qt4 bindings for the D-BUS messaging system
LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus
USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib gui xml
+QT_COMPONENTS= qmake_build moc_build rcc_build corelib xml
QT_NONSTANDARD= yes
QT_DIST= yes
MAKE_JOBS_UNSAFE= yes
@@ -48,9 +48,14 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ARGS+= --no-gui \
+ --no-phonon
+
pre-configure:
- ${REINPLACE_CMD} -e 's|qdbusviewer||g' ${BUILD_WRKSRC}/qdbus.pro
- ${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' ${BUILD_WRKSRC}/qdbus.pro
+ ${REINPLACE_CMD} -e 's|SUBDIRS = qdbus|SUBDIRS = ../../src/${PORTNAME} qdbus|g' \
+ ${BUILD_WRKSRC}/qdbus.pro
${REINPLACE_CMD} -e 's|"/moc"|"/moc-qt4"|' \
${BUILD_WRKSRC}/qdbuscpp2xml/qdbuscpp2xml.cpp
${MKDIR} ${WRKSRC}/mkspecs
@@ -64,4 +69,4 @@ post-configure:
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
${WRKSRC}/lib/pkgconfig/QtDBus.pc
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/qmake4/Makefile b/devel/qmake4/Makefile
index 2d1f008a0bc0..88bab7969901 100644
--- a/devel/qmake4/Makefile
+++ b/devel/qmake4/Makefile
@@ -55,6 +55,11 @@ post-patch:
@${CP} ${WRKSRC}/../mkspecs/common/g++.conf ${WRKSRC}/../mkspecs/common/clang.conf
@${REINPLACE_CMD} -e 's|gcc|clang|g' -e 's|g++|clang++|g' \
${WRKSRC}/../mkspecs/common/clang.conf
+
+ # FIXME: This is ugly
+ @${RM} ${WRKSRC}/../mkspecs/freebsd-g++/*.orig
+ @${RM} ${WRKSRC}/../mkspecs/freebsd-g++40/*.orig
+
.for c in clang llvm
@${CP} -PpR ${WRKSRC}/../mkspecs/freebsd-g++ ${WRKSRC}/../mkspecs/freebsd-${c}
@${REINPLACE_CMD} -e 's|g++|${c}|g' \
@@ -83,10 +88,6 @@ do-configure:
CXXFLAGS+= -mieee
.endif
-.if ${OSVERSION} < 700042 && ${ARCH} == "amd64"
-CXXFLAGS+= -fno-gcse
-.endif
-
post-install:
${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default
diff --git a/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
new file mode 100644
index 000000000000..9ae0c7fff3fd
--- /dev/null
+++ b/devel/qmake4/files/patch-qt4-before-ports-in-mkspecs.diff
@@ -0,0 +1,26 @@
+--- ../mkspecs/freebsd-g++/qmake.conf.old 2011-09-17 01:02:43.000000000 -0300
++++ ../mkspecs/freebsd-g++/qmake.conf 2011-09-17 00:23:09.000000000 -0300
+@@ -13,8 +13,8 @@
+ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
+
+ # Addon software goes into /usr/local on the BSDs, by default we will look there
+-QMAKE_INCDIR = /usr/local/include
+-QMAKE_LIBDIR = /usr/local/lib
++QMAKE_INCDIR = $$[QT_INSTALL_HEADERS] /usr/local/include
++QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] /usr/local/lib
+ QMAKE_INCDIR_X11 = /usr/X11R6/include
+ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
+--- ../mkspecs/freebsd-g++40/qmake.conf.old 2011-09-17 01:03:00.000000000 -0300
++++ ../mkspecs/freebsd-g++40/qmake.conf 2011-09-17 00:23:41.000000000 -0300
+@@ -37,8 +37,8 @@
+ QMAKE_CXXFLAGS_THREAD = $$QMAKE_CFLAGS_THREAD
+
+ # Addon software goes into /usr/local on the BSDs, by default we will look there
+-QMAKE_INCDIR = /usr/local/include
+-QMAKE_LIBDIR = /usr/local/lib
++QMAKE_INCDIR = $$[QT_INSTALL_HEADERS] /usr/local/include
++QMAKE_LIBDIR = $$[QT_INSTALL_LIBS] /usr/local/lib
+ QMAKE_INCDIR_X11 = /usr/X11R6/include
+ QMAKE_LIBDIR_X11 = /usr/X11R6/lib
+ QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
diff --git a/devel/qmake4/pkg-plist b/devel/qmake4/pkg-plist
index e05bc2c595d9..7e49b1999ba9 100644
--- a/devel/qmake4/pkg-plist
+++ b/devel/qmake4/pkg-plist
@@ -45,6 +45,8 @@ share/qt4/mkspecs/common/symbian/stl-off/new
share/qt4/mkspecs/common/symbian/symbian-makefile.conf
share/qt4/mkspecs/common/symbian/symbian-mmp.conf
share/qt4/mkspecs/common/symbian/symbian.conf
+share/qt4/mkspecs/common/symbian/symbianincludes.h
+share/qt4/mkspecs/common/symbian/template.applite
share/qt4/mkspecs/common/unix.conf
share/qt4/mkspecs/common/wince/qmake.conf
share/qt4/mkspecs/common/wince/qplatformdefs.h
@@ -113,6 +115,7 @@ share/qt4/mkspecs/features/symbian/moc.prf
share/qt4/mkspecs/features/symbian/nested_exceptions.prf
share/qt4/mkspecs/features/symbian/opengl.prf
share/qt4/mkspecs/features/symbian/platform_paths.prf
+share/qt4/mkspecs/features/symbian/prepend_includepath.prf
share/qt4/mkspecs/features/symbian/qt.prf
share/qt4/mkspecs/features/symbian/qt_config.prf
share/qt4/mkspecs/features/symbian/release.prf
@@ -120,6 +123,7 @@ share/qt4/mkspecs/features/symbian/run_on_phone.prf
share/qt4/mkspecs/features/symbian/sis_targets.prf
share/qt4/mkspecs/features/symbian/stl.prf
share/qt4/mkspecs/features/symbian/stl_off.prf
+share/qt4/mkspecs/features/symbian/symbian_appbooster.prf
share/qt4/mkspecs/features/symbian/symbian_building.prf
share/qt4/mkspecs/features/symbian/thread.prf
share/qt4/mkspecs/features/testcase.prf
@@ -332,6 +336,13 @@ share/qt4/mkspecs/solaris-g++/qmake.conf
share/qt4/mkspecs/solaris-g++/qplatformdefs.h
share/qt4/mkspecs/symbian-abld/qmake.conf
share/qt4/mkspecs/symbian-abld/qplatformdefs.h
+share/qt4/mkspecs/symbian-armcc/features/default_post.prf
+share/qt4/mkspecs/symbian-armcc/qmake.conf
+share/qt4/mkspecs/symbian-armcc/qplatformdefs.h
+share/qt4/mkspecs/symbian-gcce/features/default_post.prf
+share/qt4/mkspecs/symbian-gcce/qmake.conf
+share/qt4/mkspecs/symbian-gcce/qplatformdefs.h
+share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_clean.flm
share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
@@ -339,12 +350,6 @@ share/qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
share/qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
share/qt4/mkspecs/symbian-sbsv2/qmake.conf
share/qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
-share/qt4/mkspecs/symbian/linux-armcc/features/default_post.prf
-share/qt4/mkspecs/symbian/linux-armcc/qmake.conf
-share/qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h
-share/qt4/mkspecs/symbian/linux-gcce/features/default_post.prf
-share/qt4/mkspecs/symbian/linux-gcce/qmake.conf
-share/qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h
share/qt4/mkspecs/tru64-cxx/qmake.conf
share/qt4/mkspecs/tru64-cxx/qplatformdefs.h
share/qt4/mkspecs/tru64-g++/qmake.conf
@@ -498,15 +503,14 @@ share/qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
@dirrm share/qt4/mkspecs/unixware-cc
@dirrm share/qt4/mkspecs/tru64-g++
@dirrm share/qt4/mkspecs/tru64-cxx
-@dirrm share/qt4/mkspecs/symbian/linux-gcce/features
-@dirrm share/qt4/mkspecs/symbian/linux-gcce
-@dirrm share/qt4/mkspecs/symbian/linux-armcc/features
-@dirrm share/qt4/mkspecs/symbian/linux-armcc
@dirrm share/qt4/mkspecs/symbian-sbsv2/flm/qt
@dirrm share/qt4/mkspecs/symbian-sbsv2/flm
@dirrm share/qt4/mkspecs/symbian-sbsv2
+@dirrm share/qt4/mkspecs/symbian-gcce/features
+@dirrm share/qt4/mkspecs/symbian-gcce
+@dirrm share/qt4/mkspecs/symbian-armcc/features
+@dirrm share/qt4/mkspecs/symbian-armcc
@dirrm share/qt4/mkspecs/symbian-abld
-@dirrm share/qt4/mkspecs/symbian
@dirrm share/qt4/mkspecs/solaris-g++-64
@dirrm share/qt4/mkspecs/solaris-g++
@dirrm share/qt4/mkspecs/solaris-cc-stlport
diff --git a/devel/qt4-designer/pkg-plist b/devel/qt4-designer/pkg-plist
index aa3957c99c88..e67113b25bd0 100644
--- a/devel/qt4-designer/pkg-plist
+++ b/devel/qt4-designer/pkg-plist
@@ -104,9 +104,9 @@ lib/qt4/libQtUiTools.prl
%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqt3supportwidgets.so.debug
%%QT_PLUGINDIR_REL%%/designer/libqwebview.so
%%DEBUG%%%%QT_PLUGINDIR_REL%%/designer/libqwebview.so.debug
-libdata/pkgconfig/QtUiTools.pc
libdata/pkgconfig/QtDesigner.pc
libdata/pkgconfig/QtDesignerComponents.pc
+libdata/pkgconfig/QtUiTools.pc
@dirrmtry %%QT_PLUGINDIR_REL%%/designer
@dirrmtry %%QT_PLUGINDIR_REL%%
@dirrmtry lib/qt4
diff --git a/devel/qt4-qdoc3/Makefile b/devel/qt4-qdoc3/Makefile
index f25cb4112760..b7b6768b2166 100644
--- a/devel/qt4-qdoc3/Makefile
+++ b/devel/qt4-qdoc3/Makefile
@@ -14,23 +14,34 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt documentation generator
USE_QT_VER= 4
-QT_COMPONENTS= qmake_build corelib xml
-QT_NONSTANDART= yes
+QT_COMPONENTS= qmake_build corelib gui xml
+QT_NONSTANDARD= yes
QT_DIST= yes
HAS_CONFIGURE= yes
-EXTRACT_AFTER_ARGS= | ${TAR} -xf - --include '${DISTNAME}/tools/${PORTNAME}'
+ALL_TARGET= first
+CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
+MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
+ PATH=${WRKSRC}/bin:$$PATH
+DO_NOT_EXTRACT= demos doc examples mkspecs qmake translations \
+ src/activeqt src/dbus src/multimedia src/opengl src/openvg \
+ src/s60installs src/s60main src/scripttools src/sql src/svg \
+ src/testlib src/winmain src/xmlpatterns
+EXTRACT_AFTER_ARGS= | ${TAR} -xf -
+.for dne in ${DO_NOT_EXTRACT}
+EXTRACT_AFTER_ARGS+= --exclude '${DISTNAME}/${dne}'
+.endfor
+
+EXTRA_PATCHES= ${.CURDIR}/../../devel/qt4/files/patch-configure
PLIST_FILES= bin/${PORTNAME}
-WRKSRC= ${WRKDIR}/${DISTNAME}/tools/${PORTNAME}
+BUILD_WRKSRC= ${WRKSRC}/tools/${PORTNAME}
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
-do-configure:
- @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
- ${QMAKE} -unix PREFIX=${PREFIX} ${PORTNAME}.pro
-
-do-install:
- ${INSTALL_PROGRAM} "${WRKSRC}/${PORTNAME}" "${PREFIX}/bin/${PORTNAME}"
+pre-configure:
+ ${MKDIR} ${WRKSRC}/mkspecs/modules
+ ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/bin/qmake
.include <bsd.port.mk>
diff --git a/devel/qt4/distinfo b/devel/qt4/distinfo
index 3a2ced9c0fb7..7bf2eed1f45b 100644
--- a/devel/qt4/distinfo
+++ b/devel/qt4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.7.3.tar.gz) = d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e
-SIZE (KDE/qt-everywhere-opensource-src-4.7.3.tar.gz) = 213659173
+SHA256 (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e
+SIZE (KDE/qt-everywhere-opensource-src-4.7.4.tar.gz) = 220388303
diff --git a/devel/qt4/pkg-plist b/devel/qt4/pkg-plist
deleted file mode 100644
index 425093431e1f..000000000000
--- a/devel/qt4/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $FreeBSD$
-@comment This list intentionally empty
diff --git a/misc/qt4-doc/pkg-plist b/misc/qt4-doc/pkg-plist
index d3ff0b7cd5f2..34955e4f8ba2 100644
--- a/misc/qt4-doc/pkg-plist
+++ b/misc/qt4-doc/pkg-plist
@@ -102,7 +102,6 @@
%%DOCSDIR%%/html/assistant-custom-help-viewer.html
%%DOCSDIR%%/html/assistant-details.html
%%DOCSDIR%%/html/assistant-manual.html
-%%DOCSDIR%%/html/assistant.dcf
%%DOCSDIR%%/html/atomic-operations.html
%%DOCSDIR%%/html/basicwidgets.html
%%DOCSDIR%%/html/bearer-management.html
@@ -394,11 +393,33 @@
%%DOCSDIR%%/html/declarative-positioners-button-qml.html
%%DOCSDIR%%/html/declarative-positioners-positioners-qml.html
%%DOCSDIR%%/html/declarative-positioners.html
+%%DOCSDIR%%/html/declarative-righttoleft-layoutdirection-layoutdirection-qml.html
+%%DOCSDIR%%/html/declarative-righttoleft-layoutdirection.html
+%%DOCSDIR%%/html/declarative-righttoleft-layoutmirroring-layoutmirroring-qml.html
+%%DOCSDIR%%/html/declarative-righttoleft-layoutmirroring.html
+%%DOCSDIR%%/html/declarative-righttoleft-textalignment-textalignment-qml.html
+%%DOCSDIR%%/html/declarative-righttoleft-textalignment.html
%%DOCSDIR%%/html/declarative-screenorientation-core-bubble-qml.html
%%DOCSDIR%%/html/declarative-screenorientation-core-button-qml.html
%%DOCSDIR%%/html/declarative-screenorientation-core-screenorientation-js.html
%%DOCSDIR%%/html/declarative-screenorientation-screenorientation-qml.html
%%DOCSDIR%%/html/declarative-screenorientation.html
+%%DOCSDIR%%/html/declarative-shadereffects-main-cpp.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-curtain-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-curtaineffect-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-dropshadow-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-dropshadoweffect-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-grayscale-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-grayscaleeffect-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-imagemask-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-imagemaskeffect-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-main-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-radialwave-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-radialwaveeffect-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-water-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-qml-watereffect-qml.html
+%%DOCSDIR%%/html/declarative-shadereffects-shadereffects-pro.html
+%%DOCSDIR%%/html/declarative-shadereffects.html
%%DOCSDIR%%/html/declarative-sqllocalstorage-hello-qml.html
%%DOCSDIR%%/html/declarative-sqllocalstorage.html
%%DOCSDIR%%/html/declarative-text-fonts-availablefonts-qml.html
@@ -414,8 +435,6 @@
%%DOCSDIR%%/html/declarative-threading-workerscript-workerscript-js.html
%%DOCSDIR%%/html/declarative-threading-workerscript-workerscript-qml.html
%%DOCSDIR%%/html/declarative-threading-workerscript.html
-%%DOCSDIR%%/html/declarative-touchinteraction-gestures-experimental-gestures-qml.html
-%%DOCSDIR%%/html/declarative-touchinteraction-gestures.html
%%DOCSDIR%%/html/declarative-touchinteraction-mousearea-mousearea-example-qml.html
%%DOCSDIR%%/html/declarative-touchinteraction-mousearea.html
%%DOCSDIR%%/html/declarative-toys-clocks-clocks-qml.html
@@ -758,7 +777,13 @@
%%DOCSDIR%%/html/demos-embedded-fluidlauncher-slideshow-h.html
%%DOCSDIR%%/html/demos-embedded-fluidlauncher.html
%%DOCSDIR%%/html/demos-embedded-lightmaps-lightmaps-cpp.html
+%%DOCSDIR%%/html/demos-embedded-lightmaps-lightmaps-h.html
%%DOCSDIR%%/html/demos-embedded-lightmaps-lightmaps-pro.html
+%%DOCSDIR%%/html/demos-embedded-lightmaps-main-cpp.html
+%%DOCSDIR%%/html/demos-embedded-lightmaps-mapzoom-cpp.html
+%%DOCSDIR%%/html/demos-embedded-lightmaps-mapzoom-h.html
+%%DOCSDIR%%/html/demos-embedded-lightmaps-slippymap-cpp.html
+%%DOCSDIR%%/html/demos-embedded-lightmaps-slippymap-h.html
%%DOCSDIR%%/html/demos-embedded-lightmaps.html
%%DOCSDIR%%/html/demos-embedded-raycasting-raycasting-cpp.html
%%DOCSDIR%%/html/demos-embedded-raycasting-raycasting-pro.html
@@ -822,6 +847,107 @@
%%DOCSDIR%%/html/demos-mainwindow-toolbar-cpp.html
%%DOCSDIR%%/html/demos-mainwindow-toolbar-h.html
%%DOCSDIR%%/html/demos-mainwindow.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-guitartuner-pro.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-guitartuner-qrc.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-images-guitartab-svg.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-images-guitartuner-icon-svg.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-images-inputmode-svg.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-images-note-svg.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-images-noteno-svg.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-application-qml.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-constants-h.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-fastfouriertransformer-cpp.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-fastfouriertransformer-h.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-guitartuner-cpp.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-guitartuner-h.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-guitartuner-ui.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-guitartunerui-cpp.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-guitartunerui-h.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-guitartunerui-ui.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-main-cpp.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-mycomponents-adjustbars-js.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-mycomponents-adjuster-qml.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-mycomponents-meter-qml.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-mycomponents-notebuttonview-qml.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-mycomponents-notesmodel-qml.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-mycomponents-togglebutton-qml.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-voiceanalyzer-cpp.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-voiceanalyzer-h.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-voicegenerator-cpp.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner-src-voicegenerator-h.html
+%%DOCSDIR%%/html/demos-mobile-guitartuner.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-businesscardhandling-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-businesscardhandling-h.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-button-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-button-h.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-cameraexample-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-cameraexample-h.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-contactsdlg-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-contactsdlg-h.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-icons-cameramms-icon-svg.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-main-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-messagehandling-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-messagehandling-h.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-qcamera-pro.html
+%%DOCSDIR%%/html/demos-mobile-qcamera-resources-qrc.html
+%%DOCSDIR%%/html/demos-mobile-qcamera.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-accelerometerfilter-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-accelerometerfilter-h.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-icons-bubblelevel-svg.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-main-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-qml-bubblelevel-qml.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-qml-button-qml.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-qml-tube-qml.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-qtbubblelevel-pro.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-resources-qrc.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-settings-h.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-taskswitcher-cpp.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel-taskswitcher-h.html
+%%DOCSDIR%%/html/demos-mobile-qtbubblelevel.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-button-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-ga-src-geaudiobuffer-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-ga-src-geaudiobuffer-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-ga-src-geaudioout-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-ga-src-geaudioout-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-ga-src-geinterfaces-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-ga-src-geinterfaces-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-game-js.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-game-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-gameengine-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-gameengine-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-icon-svg.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-invsounds-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-invsounds-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-main-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-mainwindow-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-mainwindow-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-menu-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-menuitem-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-message-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-missile-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-myeventfilter-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-myeventfilter-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-myship-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-levelone-level-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-levelone-levelone-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-levelone-levelone-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-levelone-levelone-pro.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-levelplugininterface-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltemplate-leveltemplate-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltemplate-leveltemplate-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltemplate-leveltemplate-pro.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltemplate-qml-enemy-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltemplate-qml-level-js.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltemplate-qml-level-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltwo-leveltwo-cpp.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltwo-leveltwo-h.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltwo-leveltwo-pro.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltwo-qml-enemy-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltwo-qml-level-js.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-plugins-leveltwo-qml-level-qml.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-quickhit-pro.html
+%%DOCSDIR%%/html/demos-mobile-quickhit-resources-qrc.html
+%%DOCSDIR%%/html/demos-mobile-quickhit.html
%%DOCSDIR%%/html/demos-pathstroke-main-cpp.html
%%DOCSDIR%%/html/demos-pathstroke-pathstroke-cpp.html
%%DOCSDIR%%/html/demos-pathstroke-pathstroke-h.html
@@ -1056,7 +1182,6 @@
%%DOCSDIR%%/html/designer-worldtimeclockplugin-worldtimeclockplugin-h.html
%%DOCSDIR%%/html/designer-worldtimeclockplugin-worldtimeclockplugin-pro.html
%%DOCSDIR%%/html/designer-worldtimeclockplugin.html
-%%DOCSDIR%%/html/designer.dcf
%%DOCSDIR%%/html/desktop-integration.html
%%DOCSDIR%%/html/desktop-screenshot-main-cpp.html
%%DOCSDIR%%/html/desktop-screenshot-screenshot-cpp.html
@@ -1193,6 +1318,7 @@
%%DOCSDIR%%/html/effects-lighting-lighting-pro.html
%%DOCSDIR%%/html/effects-lighting-main-cpp.html
%%DOCSDIR%%/html/effects-lighting.html
+%%DOCSDIR%%/html/embeddedlinux-support.html
%%DOCSDIR%%/html/events.html
%%DOCSDIR%%/html/eventsandfilters.html
%%DOCSDIR%%/html/examples-activeqt.html
@@ -1251,6 +1377,7 @@
%%DOCSDIR%%/html/gestures-imagegestures-mainwidget-h.html
%%DOCSDIR%%/html/gestures-imagegestures.html
%%DOCSDIR%%/html/gestures-overview.html
+%%DOCSDIR%%/html/gettingstarted-develop.html
%%DOCSDIR%%/html/gettingstarted.html
%%DOCSDIR%%/html/gettingstartedqml.html
%%DOCSDIR%%/html/gettingstartedqt.html
@@ -1461,6 +1588,9 @@
%%DOCSDIR%%/html/images/assistant-preferences-options.png
%%DOCSDIR%%/html/images/assistant-search.png
%%DOCSDIR%%/html/images/assistant-toolbar.png
+%%DOCSDIR%%/html/images/audiodevices-example.png
+%%DOCSDIR%%/html/images/audioinput-example.png
+%%DOCSDIR%%/html/images/audiooutput-example.png
%%DOCSDIR%%/html/images/axisrotation.png
%%DOCSDIR%%/html/images/basicdrawing-example.png
%%DOCSDIR%%/html/images/basicgraphicslayouts-example.png
@@ -1469,16 +1599,10 @@
%%DOCSDIR%%/html/images/bearercloud-example.png
%%DOCSDIR%%/html/images/bearermonitor-example.png
%%DOCSDIR%%/html/images/bearings.png
-%%DOCSDIR%%/html/images/bg_l.png
-%%DOCSDIR%%/html/images/bg_l_blank.png
-%%DOCSDIR%%/html/images/bg_ll_blank.png
-%%DOCSDIR%%/html/images/bg_r.png
-%%DOCSDIR%%/html/images/bg_ul_blank.png
%%DOCSDIR%%/html/images/blockingfortuneclient-example.png
%%DOCSDIR%%/html/images/blurpickereffect-example.png
%%DOCSDIR%%/html/images/books-demo.png
%%DOCSDIR%%/html/images/borderlayout-example.png
-%%DOCSDIR%%/html/images/box_bg.png
%%DOCSDIR%%/html/images/boxes-demo.png
%%DOCSDIR%%/html/images/branchindicatorimage.png
%%DOCSDIR%%/html/images/breadcrumb.png
@@ -1508,6 +1632,28 @@
%%DOCSDIR%%/html/images/calculatorform-example.png
%%DOCSDIR%%/html/images/calendar-example.png
%%DOCSDIR%%/html/images/calendarwidgetexample.png
+%%DOCSDIR%%/html/images/canvas_arcTo.png
+%%DOCSDIR%%/html/images/canvas_arcTo2.png
+%%DOCSDIR%%/html/images/canvas_clip-complex.png
+%%DOCSDIR%%/html/images/canvas_closepath.gif
+%%DOCSDIR%%/html/images/canvas_composite.png
+%%DOCSDIR%%/html/images/canvas_context.gif
+%%DOCSDIR%%/html/images/canvas_lineStrokeTo.gif
+%%DOCSDIR%%/html/images/canvas_linecap.png
+%%DOCSDIR%%/html/images/canvas_math.png
+%%DOCSDIR%%/html/images/canvas_math_rotate.png
+%%DOCSDIR%%/html/images/canvas_pattern.png
+%%DOCSDIR%%/html/images/canvas_rectangles.gif
+%%DOCSDIR%%/html/images/canvas_rotate.png
+%%DOCSDIR%%/html/images/canvas_scale.png
+%%DOCSDIR%%/html/images/canvas_scalex.png
+%%DOCSDIR%%/html/images/canvas_scaley.png
+%%DOCSDIR%%/html/images/canvas_skewx.png
+%%DOCSDIR%%/html/images/canvas_skewy.png
+%%DOCSDIR%%/html/images/canvas_startAngle.png
+%%DOCSDIR%%/html/images/canvas_text.png
+%%DOCSDIR%%/html/images/canvas_translate.png
+%%DOCSDIR%%/html/images/canvas_translatey.png
%%DOCSDIR%%/html/images/capabilitiesexample.png
%%DOCSDIR%%/html/images/cde-calendarwidget.png
%%DOCSDIR%%/html/images/cde-checkbox.png
@@ -1579,9 +1725,9 @@
%%DOCSDIR%%/html/images/collidingmice-example.png
%%DOCSDIR%%/html/images/coloreditorfactoryimage.png
%%DOCSDIR%%/html/images/columnview.png
-%%DOCSDIR%%/html/images/combo-widget-mapper.png
%%DOCSDIR%%/html/images/combobox.png
%%DOCSDIR%%/html/images/comboboximage.png
+%%DOCSDIR%%/html/images/combowidgetmapper-example.png
%%DOCSDIR%%/html/images/completer-example-country.png
%%DOCSDIR%%/html/images/completer-example-dirmodel.png
%%DOCSDIR%%/html/images/completer-example-qdirmodel.png
@@ -1636,6 +1782,7 @@
%%DOCSDIR%%/html/images/declarative-adv-tutorial4.gif
%%DOCSDIR%%/html/images/declarative-anchors_example.png
%%DOCSDIR%%/html/images/declarative-anchors_example2.png
+%%DOCSDIR%%/html/images/declarative-colors.png
%%DOCSDIR%%/html/images/declarative-folderlistmodel.png
%%DOCSDIR%%/html/images/declarative-item_opacity1.png
%%DOCSDIR%%/html/images/declarative-item_opacity2.png
@@ -1788,7 +1935,6 @@
%%DOCSDIR%%/html/images/drilldown-example.png
%%DOCSDIR%%/html/images/dropsite-example.png
%%DOCSDIR%%/html/images/dummy_tree.png
-%%DOCSDIR%%/html/images/dynamiclayouts-example.png
%%DOCSDIR%%/html/images/easing-example.png
%%DOCSDIR%%/html/images/echopluginexample.png
%%DOCSDIR%%/html/images/edge1.png
@@ -1814,7 +1960,6 @@
%%DOCSDIR%%/html/images/fademessageeffect-example-faded.png
%%DOCSDIR%%/html/images/fademessageeffect-example.png
%%DOCSDIR%%/html/images/fancybrowser-example.png
-%%DOCSDIR%%/html/images/feedbackground.png
%%DOCSDIR%%/html/images/fetchmore-example.png
%%DOCSDIR%%/html/images/filedialogurls.png
%%DOCSDIR%%/html/images/filetree_1-example.png
@@ -1907,7 +2052,6 @@
%%DOCSDIR%%/html/images/gtk-toolbutton.png
%%DOCSDIR%%/html/images/gtk-treeview.png
%%DOCSDIR%%/html/images/header.png
-%%DOCSDIR%%/html/images/header_bg.png
%%DOCSDIR%%/html/images/headerimage.png
%%DOCSDIR%%/html/images/hellogl-es-example.png
%%DOCSDIR%%/html/images/hellogl-example.png
@@ -1962,6 +2106,7 @@
%%DOCSDIR%%/html/images/layout-examples.png
%%DOCSDIR%%/html/images/layout1.png
%%DOCSDIR%%/html/images/layout2.png
+%%DOCSDIR%%/html/images/layoutmirroring.png
%%DOCSDIR%%/html/images/licensewizard-example.png
%%DOCSDIR%%/html/images/licensewizard-flow.png
%%DOCSDIR%%/html/images/lightingeffect-example.png
@@ -2014,7 +2159,10 @@
%%DOCSDIR%%/html/images/list_table_tree.png
%%DOCSDIR%%/html/images/listmodel-nested.png
%%DOCSDIR%%/html/images/listmodel.png
+%%DOCSDIR%%/html/images/listview-decorations.png
%%DOCSDIR%%/html/images/listview-highlight.png
+%%DOCSDIR%%/html/images/listview-section.png
+%%DOCSDIR%%/html/images/listview-setup.png
%%DOCSDIR%%/html/images/listview-simple.png
%%DOCSDIR%%/html/images/listview.png
%%DOCSDIR%%/html/images/localfortuneclient-example.png
@@ -2062,11 +2210,12 @@
%%DOCSDIR%%/html/images/mandelbrot_zoom2.png
%%DOCSDIR%%/html/images/mandelbrot_zoom3.png
%%DOCSDIR%%/html/images/margins_qml.png
+%%DOCSDIR%%/html/images/mask0.png
+%%DOCSDIR%%/html/images/mask1.png
%%DOCSDIR%%/html/images/masterdetail-example.png
%%DOCSDIR%%/html/images/mdi-cascade.png
%%DOCSDIR%%/html/images/mdi-example.png
%%DOCSDIR%%/html/images/mdi-tile.png
-%%DOCSDIR%%/html/images/mediaplayer-demo.png
%%DOCSDIR%%/html/images/menu.png
%%DOCSDIR%%/html/images/menubar.png
%%DOCSDIR%%/html/images/menubarimage.png
@@ -2079,6 +2228,8 @@
%%DOCSDIR%%/html/images/modelview-begin-insert-rows.png
%%DOCSDIR%%/html/images/modelview-begin-remove-columns.png
%%DOCSDIR%%/html/images/modelview-begin-remove-rows.png
+%%DOCSDIR%%/html/images/modelview-combobox.png
+%%DOCSDIR%%/html/images/modelview-header.png
%%DOCSDIR%%/html/images/modelview-models.png
%%DOCSDIR%%/html/images/modelview-move-rows-1.png
%%DOCSDIR%%/html/images/modelview-move-rows-2.png
@@ -2134,8 +2285,6 @@
%%DOCSDIR%%/html/images/orderform-example.png
%%DOCSDIR%%/html/images/overpainting-example.png
%%DOCSDIR%%/html/images/padnavigator-example.png
-%%DOCSDIR%%/html/images/page.png
-%%DOCSDIR%%/html/images/page_bg.png
%%DOCSDIR%%/html/images/painterpaths-example.png
%%DOCSDIR%%/html/images/painting-examples.png
%%DOCSDIR%%/html/images/paintsystem-antialiasing.png
@@ -2218,13 +2367,13 @@
%%DOCSDIR%%/html/images/progressbarimage.png
%%DOCSDIR%%/html/images/propagation-custom.png
%%DOCSDIR%%/html/images/propagation-standard.png
-%%DOCSDIR%%/html/images/propanim.gif
%%DOCSDIR%%/html/images/pushbutton.png
%%DOCSDIR%%/html/images/q3painter_rationale.png
%%DOCSDIR%%/html/images/qactiongroup-align.png
%%DOCSDIR%%/html/images/qcalendarwidget-grid.png
%%DOCSDIR%%/html/images/qcalendarwidget-maximum.png
%%DOCSDIR%%/html/images/qcalendarwidget-minimum.png
+%%DOCSDIR%%/html/images/qcameraexample.png
%%DOCSDIR%%/html/images/qcanvasellipse.png
%%DOCSDIR%%/html/images/qcdestyle.png
%%DOCSDIR%%/html/images/qcolor-cmyk.png
@@ -2315,6 +2464,7 @@
%%DOCSDIR%%/html/images/qmatrix-representation.png
%%DOCSDIR%%/html/images/qmatrix-simpletransformation.png
%%DOCSDIR%%/html/images/qmdisubwindowlayout.png
+%%DOCSDIR%%/html/images/qmediaplayer-demo.png
%%DOCSDIR%%/html/images/qmessagebox-crit.png
%%DOCSDIR%%/html/images/qmessagebox-info.png
%%DOCSDIR%%/html/images/qmessagebox-quest.png
@@ -2332,11 +2482,9 @@
%%DOCSDIR%%/html/images/qml-coloranim-example.png
%%DOCSDIR%%/html/images/qml-column.png
%%DOCSDIR%%/html/images/qml-corkboards-example.png
-%%DOCSDIR%%/html/images/qml-dial.png
%%DOCSDIR%%/html/images/qml-dialcontrol-example.png
%%DOCSDIR%%/html/images/qml-dynamicscene-example.png
%%DOCSDIR%%/html/images/qml-easing-example.png
-%%DOCSDIR%%/html/images/qml-extending-types.png
%%DOCSDIR%%/html/images/qml-flickr-demo-small.png
%%DOCSDIR%%/html/images/qml-flickr-demo.png
%%DOCSDIR%%/html/images/qml-flipable-example.png
@@ -2352,20 +2500,16 @@
%%DOCSDIR%%/html/images/qml-grid-no-spacing.png
%%DOCSDIR%%/html/images/qml-grid-spacing.png
%%DOCSDIR%%/html/images/qml-gridview-example.png
+%%DOCSDIR%%/html/images/qml-guitartuner-example.png
%%DOCSDIR%%/html/images/qml-i18n-example.png
%%DOCSDIR%%/html/images/qml-image-example.png
%%DOCSDIR%%/html/images/qml-imageprovider-example.png
-%%DOCSDIR%%/html/images/qml-intro-anchors1.png
-%%DOCSDIR%%/html/images/qml-intro-anchors2.png
-%%DOCSDIR%%/html/images/qml-intro-anchors3.png
-%%DOCSDIR%%/html/images/qml-intro-helloa.png
%%DOCSDIR%%/html/images/qml-layoutitem-example.png
%%DOCSDIR%%/html/images/qml-listview-dynamiclist-example.png
%%DOCSDIR%%/html/images/qml-listview-expandingdelegates-example.png
%%DOCSDIR%%/html/images/qml-listview-highlight-example.png
%%DOCSDIR%%/html/images/qml-listview-highlightranges-example.png
%%DOCSDIR%%/html/images/qml-listview-sections-example.png
-%%DOCSDIR%%/html/images/qml-listview-snippet.png
%%DOCSDIR%%/html/images/qml-minehunt-demo-small.png
%%DOCSDIR%%/html/images/qml-minehunt-demo.png
%%DOCSDIR%%/html/images/qml-mousearea-example.png
@@ -2382,8 +2526,11 @@
%%DOCSDIR%%/html/images/qml-propertyanim-example.png
%%DOCSDIR%%/html/images/qml-qgraphicsgridlayout-example.png
%%DOCSDIR%%/html/images/qml-qgraphicslinearlayout-example.png
+%%DOCSDIR%%/html/images/qml-qtbubblelevel-demo.png
%%DOCSDIR%%/html/images/qml-qwidgets-example.png
%%DOCSDIR%%/html/images/qml-repeater-grid-index.png
+%%DOCSDIR%%/html/images/qml-righttoleft-layoutdirection-example.png
+%%DOCSDIR%%/html/images/qml-righttoleft-layoutmirroring-example.png
%%DOCSDIR%%/html/images/qml-row.png
%%DOCSDIR%%/html/images/qml-rssnews-demo-small.png
%%DOCSDIR%%/html/images/qml-rssnews-demo.png
@@ -2391,6 +2538,7 @@
%%DOCSDIR%%/html/images/qml-samegame-demo.png
%%DOCSDIR%%/html/images/qml-scrollbar-example.png
%%DOCSDIR%%/html/images/qml-searchbox-example.png
+%%DOCSDIR%%/html/images/qml-shadereffects-example.png
%%DOCSDIR%%/html/images/qml-slideswitch-example.png
%%DOCSDIR%%/html/images/qml-snake-demo-small.png
%%DOCSDIR%%/html/images/qml-snake-demo.png
@@ -2424,6 +2572,7 @@
%%DOCSDIR%%/html/images/qml-webview-newwindows-example.png
%%DOCSDIR%%/html/images/qml-xmlhttprequest-example.png
%%DOCSDIR%%/html/images/qml-xmllistmodel-example.png
+%%DOCSDIR%%/html/images/qmldesigner-visual-editor.png
%%DOCSDIR%%/html/images/qmotifstyle.png
%%DOCSDIR%%/html/images/qobjectxmlmodel-example.png
%%DOCSDIR%%/html/images/qpainter-affinetransformations.png
@@ -2542,6 +2691,7 @@
%%DOCSDIR%%/html/images/qtableview-resized.png
%%DOCSDIR%%/html/images/qtconcurrent-progressdialog.png
%%DOCSDIR%%/html/images/qtconfig-appearance.png
+%%DOCSDIR%%/html/images/qtcreator-target-selector.png
%%DOCSDIR%%/html/images/qtdemo-small.png
%%DOCSDIR%%/html/images/qtdemo.png
%%DOCSDIR%%/html/images/qtdesignerextensions.png
@@ -2555,6 +2705,7 @@
%%DOCSDIR%%/html/images/qtransform-representation.png
%%DOCSDIR%%/html/images/qtransform-simpletransformation.png
%%DOCSDIR%%/html/images/qtscript-calculator-example.png
+%%DOCSDIR%%/html/images/qtscript-context2d.png
%%DOCSDIR%%/html/images/qtscript-debugger.png
%%DOCSDIR%%/html/images/qtscript-examples.png
%%DOCSDIR%%/html/images/qtwizard-aero1.png
@@ -2615,6 +2766,7 @@
%%DOCSDIR%%/html/images/richtext-document.png
%%DOCSDIR%%/html/images/richtext-examples.png
%%DOCSDIR%%/html/images/rintersect.png
+%%DOCSDIR%%/html/images/roaming-states.png
%%DOCSDIR%%/html/images/rogue-example.png
%%DOCSDIR%%/html/images/rogue-statechart.png
%%DOCSDIR%%/html/images/rsslistingexample.png
@@ -2626,6 +2778,39 @@
%%DOCSDIR%%/html/images/samplebuffers-example.png
%%DOCSDIR%%/html/images/saxbookmarks-example.png
%%DOCSDIR%%/html/images/schema-example.png
+%%DOCSDIR%%/html/images/scr_anim_accord.png
+%%DOCSDIR%%/html/images/scr_anim_demo-rotate.png
+%%DOCSDIR%%/html/images/scr_anim_demo-scale.png
+%%DOCSDIR%%/html/images/scr_anim_demo-skew.png
+%%DOCSDIR%%/html/images/scr_anim_gallery.png
+%%DOCSDIR%%/html/images/scr_anim_panel.png
+%%DOCSDIR%%/html/images/scr_anim_pulse.png
+%%DOCSDIR%%/html/images/scr_anim_skew.png
+%%DOCSDIR%%/html/images/scr_anim_slide1.png
+%%DOCSDIR%%/html/images/scr_anim_tabbedSkew.png
+%%DOCSDIR%%/html/images/scr_css3_backgrounds.png
+%%DOCSDIR%%/html/images/scr_css3_border-img.png
+%%DOCSDIR%%/html/images/scr_css3_grad-radial.png
+%%DOCSDIR%%/html/images/scr_css3_gradientBack.png
+%%DOCSDIR%%/html/images/scr_css3_gradientBackStop.png
+%%DOCSDIR%%/html/images/scr_css3_gradientButton.png
+%%DOCSDIR%%/html/images/scr_css3_mask-grad.png
+%%DOCSDIR%%/html/images/scr_css3_mask-img.png
+%%DOCSDIR%%/html/images/scr_css3_multicol.png
+%%DOCSDIR%%/html/images/scr_css3_reflect.png
+%%DOCSDIR%%/html/images/scr_css3_scroll.png
+%%DOCSDIR%%/html/images/scr_css3_sel-nth.png
+%%DOCSDIR%%/html/images/scr_css3_text-overflow.png
+%%DOCSDIR%%/html/images/scr_css3_text-shadow.png
+%%DOCSDIR%%/html/images/scr_css3_text-stroke.png
+%%DOCSDIR%%/html/images/scr_form_tapper.png
+%%DOCSDIR%%/html/images/scr_form_toggler.png
+%%DOCSDIR%%/html/images/scr_layout_link-fmt.png
+%%DOCSDIR%%/html/images/scr_layout_tbl-keyhole.png
+%%DOCSDIR%%/html/images/scr_mob_condjs.png
+%%DOCSDIR%%/html/images/scr_mob_layout.png
+%%DOCSDIR%%/html/images/scr_mob_mediaquery.png
+%%DOCSDIR%%/html/images/scr_storage.png
%%DOCSDIR%%/html/images/screenshot-example.png
%%DOCSDIR%%/html/images/scribble-example.png
%%DOCSDIR%%/html/images/scrollbar.png
@@ -2642,6 +2827,7 @@
%%DOCSDIR%%/html/images/selection2.png
%%DOCSDIR%%/html/images/session.png
%%DOCSDIR%%/html/images/settingseditor-example.png
+%%DOCSDIR%%/html/images/shaderexample.png
%%DOCSDIR%%/html/images/shapedclock-dragging.png
%%DOCSDIR%%/html/images/shapedclock-example.png
%%DOCSDIR%%/html/images/shareddirmodel.png
@@ -2669,7 +2855,6 @@
%%DOCSDIR%%/html/images/spinboxdelegate-example.png
%%DOCSDIR%%/html/images/spinboxes-example.png
%%DOCSDIR%%/html/images/spinboximage.png
-%%DOCSDIR%%/html/images/spinner.gif
%%DOCSDIR%%/html/images/spreadsheet-demo.png
%%DOCSDIR%%/html/images/sprites-combined.png
%%DOCSDIR%%/html/images/sql-examples.png
@@ -2711,7 +2896,6 @@
%%DOCSDIR%%/html/images/stylesheet-branch-more.png
%%DOCSDIR%%/html/images/stylesheet-branch-open.png
%%DOCSDIR%%/html/images/stylesheet-coffee-cleanlooks.png
-%%DOCSDIR%%/html/images/stylesheet-coffee-plastique.png
%%DOCSDIR%%/html/images/stylesheet-coffee-xp.png
%%DOCSDIR%%/html/images/stylesheet-pagefold-mac.png
%%DOCSDIR%%/html/images/stylesheet-pagefold.png
@@ -2747,7 +2931,6 @@
%%DOCSDIR%%/html/images/tabwidget.png
%%DOCSDIR%%/html/images/taskmenuextension-dialog.png
%%DOCSDIR%%/html/images/taskmenuextension-example-faded.png
-%%DOCSDIR%%/html/images/taskmenuextension-example.png
%%DOCSDIR%%/html/images/taskmenuextension-menu.png
%%DOCSDIR%%/html/images/tcpstream.png
%%DOCSDIR%%/html/images/tetrix-example.png
@@ -2760,8 +2943,10 @@
%%DOCSDIR%%/html/images/texttable-split.png
%%DOCSDIR%%/html/images/textures-example.png
%%DOCSDIR%%/html/images/thread-examples.png
+%%DOCSDIR%%/html/images/thread_clock.png
%%DOCSDIR%%/html/images/threadedfortuneserver-example.png
%%DOCSDIR%%/html/images/threadsandobjects.png
+%%DOCSDIR%%/html/images/threadvisual-example.png
%%DOCSDIR%%/html/images/titlebar.png
%%DOCSDIR%%/html/images/titlebarimage.png
%%DOCSDIR%%/html/images/tool-examples.png
@@ -2787,12 +2972,10 @@
%%DOCSDIR%%/html/images/treemodel-structure.png
%%DOCSDIR%%/html/images/treemodelcompleter-example.png
%%DOCSDIR%%/html/images/treeview.png
-%%DOCSDIR%%/html/images/treeview_sml.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/udppackets.png
%%DOCSDIR%%/html/images/uitools-examples.png
%%DOCSDIR%%/html/images/undodemo.png
@@ -3347,8 +3530,10 @@
%%DOCSDIR%%/html/linguist-trollprint-trollprint-pro.html
%%DOCSDIR%%/html/linguist-trollprint.html
%%DOCSDIR%%/html/linguist-ts-file-format.html
-%%DOCSDIR%%/html/linguist.dcf
+%%DOCSDIR%%/html/linuxx11-support.html
%%DOCSDIR%%/html/mac-differences.html
+%%DOCSDIR%%/html/mac-support.html
+%%DOCSDIR%%/html/maemo-support.html
%%DOCSDIR%%/html/mainwindow-classes.html
%%DOCSDIR%%/html/mainwindow.html
%%DOCSDIR%%/html/mainwindows-application-application-pro.html
@@ -3387,6 +3572,7 @@
%%DOCSDIR%%/html/mainwindows-sdi-sdi-pro.html
%%DOCSDIR%%/html/mainwindows-sdi-sdi-qrc.html
%%DOCSDIR%%/html/mainwindows-sdi.html
+%%DOCSDIR%%/html/meego-support.html
%%DOCSDIR%%/html/metaobjects.html
%%DOCSDIR%%/html/moc.html
%%DOCSDIR%%/html/model-view-programming.html
@@ -3394,6 +3580,7 @@
%%DOCSDIR%%/html/modelview-part2-main-cpp.html
%%DOCSDIR%%/html/modelview.html
%%DOCSDIR%%/html/modules.html
+%%DOCSDIR%%/html/mouseevents.html
%%DOCSDIR%%/html/multimedia-audiodevices-audiodevices-cpp.html
%%DOCSDIR%%/html/multimedia-audiodevices-audiodevices-h.html
%%DOCSDIR%%/html/multimedia-audiodevices-audiodevices-pro.html
@@ -3904,7 +4091,11 @@
%%DOCSDIR%%/html/q3dict.html
%%DOCSDIR%%/html/q3dictiterator-members.html
%%DOCSDIR%%/html/q3dictiterator.html
+%%DOCSDIR%%/html/q3dns-mailserver-members.html
+%%DOCSDIR%%/html/q3dns-mailserver.html
%%DOCSDIR%%/html/q3dns-members.html
+%%DOCSDIR%%/html/q3dns-server-members.html
+%%DOCSDIR%%/html/q3dns-server.html
%%DOCSDIR%%/html/q3dns.html
%%DOCSDIR%%/html/q3dockarea-members.html
%%DOCSDIR%%/html/q3dockarea.html
@@ -5080,7 +5271,6 @@
%%DOCSDIR%%/html/qmake-tutorial.html
%%DOCSDIR%%/html/qmake-using.html
%%DOCSDIR%%/html/qmake-variable-reference.html
-%%DOCSDIR%%/html/qmake.dcf
%%DOCSDIR%%/html/qmap-const-iterator-members.html
%%DOCSDIR%%/html/qmap-const-iterator-qt3.html
%%DOCSDIR%%/html/qmap-const-iterator.html
@@ -5145,10 +5335,15 @@
%%DOCSDIR%%/html/qml-animation-members.html
%%DOCSDIR%%/html/qml-animation-transition.html
%%DOCSDIR%%/html/qml-animation.html
+%%DOCSDIR%%/html/qml-architecture.html
%%DOCSDIR%%/html/qml-basic-interaction-elements.html
%%DOCSDIR%%/html/qml-basic-visual-elements.html
%%DOCSDIR%%/html/qml-behavior-members.html
%%DOCSDIR%%/html/qml-behavior.html
+%%DOCSDIR%%/html/qml-behaviors-and-states.html
+%%DOCSDIR%%/html/qml-best-practices-coding.html
+%%DOCSDIR%%/html/qml-best-practices-datatypes.html
+%%DOCSDIR%%/html/qml-best-practices.html
%%DOCSDIR%%/html/qml-binding-members.html
%%DOCSDIR%%/html/qml-binding.html
%%DOCSDIR%%/html/qml-bool.html
@@ -5172,8 +5367,8 @@
%%DOCSDIR%%/html/qml-event-elements.html
%%DOCSDIR%%/html/qml-extending-tutorial-index.html
%%DOCSDIR%%/html/qml-extending-tutorial7.html
-%%DOCSDIR%%/html/qml-extending-types.html
%%DOCSDIR%%/html/qml-extending.html
+%%DOCSDIR%%/html/qml-features.html
%%DOCSDIR%%/html/qml-flickable-members.html
%%DOCSDIR%%/html/qml-flickable.html
%%DOCSDIR%%/html/qml-flipable-members.html
@@ -5217,6 +5412,8 @@
%%DOCSDIR%%/html/qml-keys.html
%%DOCSDIR%%/html/qml-layoutitem-members.html
%%DOCSDIR%%/html/qml-layoutitem.html
+%%DOCSDIR%%/html/qml-layoutmirroring-members.html
+%%DOCSDIR%%/html/qml-layoutmirroring.html
%%DOCSDIR%%/html/qml-list.html
%%DOCSDIR%%/html/qml-listelement.html
%%DOCSDIR%%/html/qml-listmodel-members.html
@@ -5264,10 +5461,13 @@
%%DOCSDIR%%/html/qml-pathview.html
%%DOCSDIR%%/html/qml-pauseanimation-members.html
%%DOCSDIR%%/html/qml-pauseanimation.html
+%%DOCSDIR%%/html/qml-pincharea-members.html
+%%DOCSDIR%%/html/qml-pincharea.html
+%%DOCSDIR%%/html/qml-pinchevent-members.html
+%%DOCSDIR%%/html/qml-pinchevent.html
%%DOCSDIR%%/html/qml-point.html
%%DOCSDIR%%/html/qml-positioners.html
%%DOCSDIR%%/html/qml-positioning-elements.html
-%%DOCSDIR%%/html/qml-presenting-data.html
%%DOCSDIR%%/html/qml-propertyaction-members.html
%%DOCSDIR%%/html/qml-propertyaction.html
%%DOCSDIR%%/html/qml-propertyanimation-members.html
@@ -5286,6 +5486,7 @@
%%DOCSDIR%%/html/qml-regexpvalidator.html
%%DOCSDIR%%/html/qml-repeater-members.html
%%DOCSDIR%%/html/qml-repeater.html
+%%DOCSDIR%%/html/qml-righttoleft.html
%%DOCSDIR%%/html/qml-rotation-members.html
%%DOCSDIR%%/html/qml-rotation.html
%%DOCSDIR%%/html/qml-rotationanimation-members.html
@@ -5298,6 +5499,11 @@
%%DOCSDIR%%/html/qml-scriptaction.html
%%DOCSDIR%%/html/qml-sequentialanimation-members.html
%%DOCSDIR%%/html/qml-sequentialanimation.html
+%%DOCSDIR%%/html/qml-shader-elements.html
+%%DOCSDIR%%/html/qml-shadereffectitem-members.html
+%%DOCSDIR%%/html/qml-shadereffectitem.html
+%%DOCSDIR%%/html/qml-shadereffectsource-members.html
+%%DOCSDIR%%/html/qml-shadereffectsource.html
%%DOCSDIR%%/html/qml-size.html
%%DOCSDIR%%/html/qml-smoothedanimation-members.html
%%DOCSDIR%%/html/qml-smoothedanimation.html
@@ -5339,6 +5545,7 @@
%%DOCSDIR%%/html/qml-vector3danimation-members.html
%%DOCSDIR%%/html/qml-vector3danimation.html
%%DOCSDIR%%/html/qml-view-elements.html
+%%DOCSDIR%%/html/qml-views.html
%%DOCSDIR%%/html/qml-visualdatamodel-members.html
%%DOCSDIR%%/html/qml-visualdatamodel.html
%%DOCSDIR%%/html/qml-visualitemmodel-members.html
@@ -5352,9 +5559,14 @@
%%DOCSDIR%%/html/qml-xmllistmodel.html
%%DOCSDIR%%/html/qml-xmlrole-members.html
%%DOCSDIR%%/html/qml-xmlrole.html
+%%DOCSDIR%%/html/qmlbasicelements.html
+%%DOCSDIR%%/html/qmlevents.html
%%DOCSDIR%%/html/qmlinuse.html
+%%DOCSDIR%%/html/qmlreusablecomponents.html
%%DOCSDIR%%/html/qmlruntime.html
+%%DOCSDIR%%/html/qmlsyntax.html
%%DOCSDIR%%/html/qmlviewer.html
+%%DOCSDIR%%/html/qmlwebkit.html
%%DOCSDIR%%/html/qmodelindex-members.html
%%DOCSDIR%%/html/qmodelindex.html
%%DOCSDIR%%/html/qmotifstyle-members.html
@@ -5964,11 +6176,11 @@
%%DOCSDIR%%/html/qt-gui-concepts.html
%%DOCSDIR%%/html/qt-mac-cocoa-licensing.html
%%DOCSDIR%%/html/qt-network.html
+%%DOCSDIR%%/html/qt-overview.html
%%DOCSDIR%%/html/qt-performance.html
%%DOCSDIR%%/html/qt-qt3.html
%%DOCSDIR%%/html/qt-resources.html
%%DOCSDIR%%/html/qt-sql.html
-%%DOCSDIR%%/html/qt.dcf
%%DOCSDIR%%/html/qt.html
%%DOCSDIR%%/html/qt.index
%%DOCSDIR%%/html/qt.pageindex
@@ -6053,6 +6265,7 @@
%%DOCSDIR%%/html/qtdemo.html
%%DOCSDIR%%/html/qtdesigner-components.html
%%DOCSDIR%%/html/qtdesigner.html
+%%DOCSDIR%%/html/qtdevelopment-steps.html
%%DOCSDIR%%/html/qtemporaryfile-members.html
%%DOCSDIR%%/html/qtemporaryfile.html
%%DOCSDIR%%/html/qtendian.html
@@ -6229,6 +6442,7 @@
%%DOCSDIR%%/html/qtprogrammers.html
%%DOCSDIR%%/html/qtquick-whatsnew.html
%%DOCSDIR%%/html/qtquick.html
+%%DOCSDIR%%/html/qtquicklicense.html
%%DOCSDIR%%/html/qtransform-members.html
%%DOCSDIR%%/html/qtransform-obsolete.html
%%DOCSDIR%%/html/qtransform.html
@@ -6257,6 +6471,10 @@
%%DOCSDIR%%/html/qttools.html
%%DOCSDIR%%/html/qtuitools.html
%%DOCSDIR%%/html/qtwebkit-bridge.html
+%%DOCSDIR%%/html/qtwebkit-guide-cache.html
+%%DOCSDIR%%/html/qtwebkit-guide-canvas.html
+%%DOCSDIR%%/html/qtwebkit-guide-css.html
+%%DOCSDIR%%/html/qtwebkit-guide.html
%%DOCSDIR%%/html/qtwebkit.html
%%DOCSDIR%%/html/qtxml.html
%%DOCSDIR%%/html/qtxmlpatterns.html
@@ -6573,6 +6791,7 @@
%%DOCSDIR%%/html/richtext-textobject-window-h.html
%%DOCSDIR%%/html/richtext-textobject.html
%%DOCSDIR%%/html/richtext.html
+%%DOCSDIR%%/html/scalability.html
%%DOCSDIR%%/html/script-calculator-calculator-js.html
%%DOCSDIR%%/html/script-calculator-calculator-pro.html
%%DOCSDIR%%/html/script-calculator-calculator-qrc.html
@@ -6657,10 +6876,6 @@
%%DOCSDIR%%/html/script-qstetrix.html
%%DOCSDIR%%/html/script.html
%%DOCSDIR%%/html/scripting.html
-%%DOCSDIR%%/html/scripts/functions.js
-%%DOCSDIR%%/html/scripts/jquery.js
-%%DOCSDIR%%/html/scripts/narrow.js
-%%DOCSDIR%%/html/scripts/superfish.js
%%DOCSDIR%%/html/session.html
%%DOCSDIR%%/html/shadow-builds-wince.html
%%DOCSDIR%%/html/shared.html
@@ -6750,12 +6965,7 @@
%%DOCSDIR%%/html/statemachine.html
%%DOCSDIR%%/html/string-processing.html
%%DOCSDIR%%/html/style-reference.html
-%%DOCSDIR%%/html/style/narrow.css
-%%DOCSDIR%%/html/style/style.css
-%%DOCSDIR%%/html/style/style_ie6.css
-%%DOCSDIR%%/html/style/style_ie7.css
-%%DOCSDIR%%/html/style/style_ie8.css
-%%DOCSDIR%%/html/style/superfish.css
+%%DOCSDIR%%/html/style/offline.css
%%DOCSDIR%%/html/stylesheet-customizing.html
%%DOCSDIR%%/html/stylesheet-designer.html
%%DOCSDIR%%/html/stylesheet-examples.html
@@ -6764,10 +6974,13 @@
%%DOCSDIR%%/html/stylesheet.html
%%DOCSDIR%%/html/supported-platforms.html
%%DOCSDIR%%/html/symbian-platform-security-requirements.html
+%%DOCSDIR%%/html/symbian-support.html
%%DOCSDIR%%/html/symbian-with-qt-introduction.html
%%DOCSDIR%%/html/symbianexceptionsafety.html
%%DOCSDIR%%/html/technology-apis.html
%%DOCSDIR%%/html/templates.html
+%%DOCSDIR%%/html/texthandling.html
+%%DOCSDIR%%/html/thread-basics.html
%%DOCSDIR%%/html/thread.html
%%DOCSDIR%%/html/threads-mandelbrot-main-cpp.html
%%DOCSDIR%%/html/threads-mandelbrot-mandelbrot-pro.html
@@ -7126,6 +7339,63 @@
%%DOCSDIR%%/html/webkit-simpleselector-window-h.html
%%DOCSDIR%%/html/webkit-simpleselector-window-ui.html
%%DOCSDIR%%/html/webkit-simpleselector.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-accord-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-demo-rotate-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-demo-scale-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-demo-skew-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-gallery-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-panel-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-pulse-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-skew-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-slide-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-anim-tabbedskew-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-backgrounds-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-border-img-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-grad-radial-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-gradientback-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-gradientbackstop-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-gradientbutton-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-mask-grad-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-mask-img-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-multicol-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-reflect-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-scroll-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-sel-nth-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-shadow-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-shadowblur-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-text-overflow-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-text-shadow-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-css3-text-stroke-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-form-tapper-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-form-toggler-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-layout-link-fmt-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-layout-tbl-keyhole-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mob-condjs-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mob-mediaquery-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mobile-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mq-desktop-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mq-mobile-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mq-touch-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mqlayout-desktop-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mqlayout-mobile-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-mqlayout-touch-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-css-storage-css.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-anim-accord-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-anim-gallery-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-anim-panel-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-anim-skew-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-css3-backgrounds-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-css3-border-img-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-css3-grad-radial-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-css3-mask-grad-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-css3-mask-img-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-css3-text-overflow-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-form-tapper-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-mob-condjs-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-mobile-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-js-storage-js.html
+%%DOCSDIR%%/html/webkit-webkit-guide-webkit-guide-pro.html
+%%DOCSDIR%%/html/webkit-webkit-guide.html
%%DOCSDIR%%/html/widgets-analogclock-analogclock-cpp.html
%%DOCSDIR%%/html/widgets-analogclock-analogclock-h.html
%%DOCSDIR%%/html/widgets-analogclock-analogclock-pro.html
@@ -7292,7 +7562,9 @@
%%DOCSDIR%%/html/widgets-windowflags-windowflags-pro.html
%%DOCSDIR%%/html/widgets-windowflags.html
%%DOCSDIR%%/html/wince-with-qt-introduction.html
+%%DOCSDIR%%/html/windows-support.html
%%DOCSDIR%%/html/windowsce-customization.html
+%%DOCSDIR%%/html/windowsce-mobile-support.html
%%DOCSDIR%%/html/windowsce-opengl.html
%%DOCSDIR%%/html/windowsce-openvg.html
%%DOCSDIR%%/html/windowsce-signing.html
@@ -7413,6 +7685,7 @@
%%DOCSDIR%%/qch/qt.qch
@dirrm %%DOCSDIR%%/qch
@dirrm %%DOCSDIR%%/html/style
+@exec mkdir -p %D/%%DOCSDIR%%/html/scripts
@dirrm %%DOCSDIR%%/html/scripts
@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips/images
@dirrm %%DOCSDIR%%/html/images/used-in-examples/widgets/tooltips
diff --git a/misc/qt4-l10n/pkg-plist b/misc/qt4-l10n/pkg-plist
index b3c98e3d35c8..bac1e4034440 100644
--- a/misc/qt4-l10n/pkg-plist
+++ b/misc/qt4-l10n/pkg-plist
@@ -4,6 +4,7 @@ share/qt4/translations/assistant_de.qm
share/qt4/translations/assistant_fr.qm
share/qt4/translations/assistant_hu.qm
share/qt4/translations/assistant_ja.qm
+share/qt4/translations/assistant_ko.qm
share/qt4/translations/assistant_pl.qm
share/qt4/translations/assistant_ru.qm
share/qt4/translations/assistant_sl.qm
@@ -15,6 +16,7 @@ share/qt4/translations/designer_de.qm
share/qt4/translations/designer_fr.qm
share/qt4/translations/designer_hu.qm
share/qt4/translations/designer_ja.qm
+share/qt4/translations/designer_ko.qm
share/qt4/translations/designer_pl.qm
share/qt4/translations/designer_ru.qm
share/qt4/translations/designer_sl.qm
@@ -26,6 +28,7 @@ share/qt4/translations/linguist_de.qm
share/qt4/translations/linguist_fr.qm
share/qt4/translations/linguist_hu.qm
share/qt4/translations/linguist_ja.qm
+share/qt4/translations/linguist_ko.qm
share/qt4/translations/linguist_pl.qm
share/qt4/translations/linguist_ru.qm
share/qt4/translations/linguist_sl.qm
@@ -37,6 +40,7 @@ share/qt4/translations/qt_cs.qm
share/qt4/translations/qt_da.qm
share/qt4/translations/qt_de.qm
share/qt4/translations/qt_es.qm
+share/qt4/translations/qt_fa.qm
share/qt4/translations/qt_fr.qm
share/qt4/translations/qt_gl.qm
share/qt4/translations/qt_he.qm
@@ -44,8 +48,10 @@ share/qt4/translations/qt_help_cs.qm
share/qt4/translations/qt_help_da.qm
share/qt4/translations/qt_help_de.qm
share/qt4/translations/qt_help_fr.qm
+share/qt4/translations/qt_help_gl.qm
share/qt4/translations/qt_help_hu.qm
share/qt4/translations/qt_help_ja.qm
+share/qt4/translations/qt_help_ko.qm
share/qt4/translations/qt_help_pl.qm
share/qt4/translations/qt_help_ru.qm
share/qt4/translations/qt_help_sl.qm
@@ -54,6 +60,7 @@ share/qt4/translations/qt_help_zh_CN.qm
share/qt4/translations/qt_help_zh_TW.qm
share/qt4/translations/qt_hu.qm
share/qt4/translations/qt_ja.qm
+share/qt4/translations/qt_ko.qm
share/qt4/translations/qt_pl.qm
share/qt4/translations/qt_pt.qm
share/qt4/translations/qt_ru.qm
@@ -65,6 +72,7 @@ share/qt4/translations/qt_zh_CN.qm
share/qt4/translations/qt_zh_TW.qm
share/qt4/translations/qtconfig_hu.qm
share/qt4/translations/qtconfig_ja.qm
+share/qt4/translations/qtconfig_ko.qm
share/qt4/translations/qtconfig_pl.qm
share/qt4/translations/qtconfig_ru.qm
share/qt4/translations/qtconfig_sl.qm
@@ -73,6 +81,7 @@ share/qt4/translations/qtconfig_zh_CN.qm
share/qt4/translations/qtconfig_zh_TW.qm
share/qt4/translations/qvfb_hu.qm
share/qt4/translations/qvfb_ja.qm
+share/qt4/translations/qvfb_ko.qm
share/qt4/translations/qvfb_pl.qm
share/qt4/translations/qvfb_ru.qm
share/qt4/translations/qvfb_sl.qm
diff --git a/misc/qt4-qtdemo/pkg-plist b/misc/qt4-qtdemo/pkg-plist
index 9373e31eb4ce..94e421fb91f2 100644
--- a/misc/qt4-qtdemo/pkg-plist
+++ b/misc/qt4-qtdemo/pkg-plist
@@ -1249,6 +1249,41 @@ share/examples/qt4/examples/declarative/positioners/add.png
share/examples/qt4/examples/declarative/positioners/del.png
share/examples/qt4/examples/declarative/positioners/positioners.qml
share/examples/qt4/examples/declarative/positioners/positioners.qmlproject
+share/examples/qt4/examples/declarative/shadereffects/main.cpp
+share/examples/qt4/examples/declarative/shadereffects/qml/Curtain.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/CurtainEffect.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/DropShadow.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/DropShadowEffect.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/Grayscale.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/GrayscaleEffect.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/ImageMask.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/ImageMaskEffect.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/RadialWave.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/RadialWaveEffect.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/Water.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/WaterEffect.qml
+share/examples/qt4/examples/declarative/shadereffects/qml/images/Curtain.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/DropShadow.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/Grayscale.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/ImageMask.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/RadialWave.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/Water.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/back.png
+share/examples/qt4/examples/declarative/shadereffects/qml/images/bg.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/desaturate.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/drop_shadow.png
+share/examples/qt4/examples/declarative/shadereffects/qml/images/fabric.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/flower.png
+share/examples/qt4/examples/declarative/shadereffects/qml/images/image1.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/image2.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/qt-logo.png
+share/examples/qt4/examples/declarative/shadereffects/qml/images/shader_effects.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/sky.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/images/toolbar.png
+share/examples/qt4/examples/declarative/shadereffects/qml/images/wave.jpg
+share/examples/qt4/examples/declarative/shadereffects/qml/main.qml
+share/examples/qt4/examples/declarative/shadereffects/shadereffects
+share/examples/qt4/examples/declarative/shadereffects/shadereffects.pro
share/examples/qt4/examples/declarative/sqllocalstorage/hello.qml
share/examples/qt4/examples/declarative/sqllocalstorage/sqllocalstorage.qmlproject
share/examples/qt4/examples/declarative/text/fonts/availableFonts.qml
@@ -1275,6 +1310,9 @@ share/examples/qt4/examples/declarative/touchinteraction/gestures/experimental-g
share/examples/qt4/examples/declarative/touchinteraction/gestures/gestures.qmlproject
share/examples/qt4/examples/declarative/touchinteraction/mousearea/mousearea-example.qml
share/examples/qt4/examples/declarative/touchinteraction/mousearea/mousearea.qmlproject
+share/examples/qt4/examples/declarative/touchinteraction/pincharea/flickresize.qml
+share/examples/qt4/examples/declarative/touchinteraction/pincharea/pincharea.qmlproject
+share/examples/qt4/examples/declarative/touchinteraction/pincharea/qt-logo.jpg
share/examples/qt4/examples/declarative/touchinteraction/touchinteraction.qmlproject
share/examples/qt4/examples/declarative/toys/README
share/examples/qt4/examples/declarative/toys/clocks/clocks.qml
@@ -3005,6 +3043,7 @@ share/examples/qt4/examples/tools/plugandpaint/plugandpaint.pro
share/examples/qt4/examples/tools/plugandpaint/plugindialog.cpp
share/examples/qt4/examples/tools/plugandpaint/plugindialog.h
share/examples/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a
+share/examples/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.prl
share/examples/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
%%DEBUG%%share/examples/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so.debug
share/examples/qt4/examples/tools/plugandpaintplugins/basictools/basictools.pro
@@ -3198,6 +3237,29 @@ share/examples/qt4/examples/tutorials/modelview/7_selections/mainwindow.h
share/examples/qt4/examples/tutorials/modelview/7_selections/mv_selections
%%DEBUG%%share/examples/qt4/examples/tutorials/modelview/7_selections/mv_selections.debug
share/examples/qt4/examples/tutorials/modelview/modelview.pro
+share/examples/qt4/examples/tutorials/threads/clock/clock
+share/examples/qt4/examples/tutorials/threads/clock/clock.pro
+share/examples/qt4/examples/tutorials/threads/clock/clockthread.cpp
+share/examples/qt4/examples/tutorials/threads/clock/clockthread.h
+share/examples/qt4/examples/tutorials/threads/clock/main.cpp
+share/examples/qt4/examples/tutorials/threads/helloconcurrent/helloconcurrent
+share/examples/qt4/examples/tutorials/threads/helloconcurrent/helloconcurrent.cpp
+share/examples/qt4/examples/tutorials/threads/helloconcurrent/helloconcurrent.pro
+share/examples/qt4/examples/tutorials/threads/hellothread/hellothread
+share/examples/qt4/examples/tutorials/threads/hellothread/hellothread.cpp
+share/examples/qt4/examples/tutorials/threads/hellothread/hellothread.h
+share/examples/qt4/examples/tutorials/threads/hellothread/hellothread.pro
+share/examples/qt4/examples/tutorials/threads/hellothread/main.cpp
+share/examples/qt4/examples/tutorials/threads/hellothreadpool/hellothreadpool
+share/examples/qt4/examples/tutorials/threads/hellothreadpool/hellothreadpool.cpp
+share/examples/qt4/examples/tutorials/threads/hellothreadpool/hellothreadpool.pro
+share/examples/qt4/examples/tutorials/threads/movedobject/main.cpp
+share/examples/qt4/examples/tutorials/threads/movedobject/movedobject
+share/examples/qt4/examples/tutorials/threads/movedobject/movedobject.pro
+share/examples/qt4/examples/tutorials/threads/movedobject/thread.cpp
+share/examples/qt4/examples/tutorials/threads/movedobject/thread.h
+share/examples/qt4/examples/tutorials/threads/movedobject/workerobject.cpp
+share/examples/qt4/examples/tutorials/threads/movedobject/workerobject.h
share/examples/qt4/examples/tutorials/tutorials.pro
share/examples/qt4/examples/uitools/multipleinheritance/calculatorform.cpp
share/examples/qt4/examples/uitools/multipleinheritance/calculatorform.h
@@ -3702,6 +3764,12 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
@dirrm share/examples/qt4/examples/uitools/textfinder
@dirrm share/examples/qt4/examples/uitools/multipleinheritance
@dirrm share/examples/qt4/examples/uitools
+@dirrm share/examples/qt4/examples/tutorials/threads/movedobject
+@dirrm share/examples/qt4/examples/tutorials/threads/hellothreadpool
+@dirrm share/examples/qt4/examples/tutorials/threads/hellothread
+@dirrm share/examples/qt4/examples/tutorials/threads/helloconcurrent
+@dirrm share/examples/qt4/examples/tutorials/threads/clock
+@dirrm share/examples/qt4/examples/tutorials/threads
@dirrm share/examples/qt4/examples/tutorials/modelview/7_selections
@dirrm share/examples/qt4/examples/tutorials/modelview/6_treeview
@dirrm share/examples/qt4/examples/tutorials/modelview/5_edit
@@ -3995,6 +4063,7 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
@dirrm share/examples/qt4/examples/declarative/toys/clocks/content
@dirrm share/examples/qt4/examples/declarative/toys/clocks
@dirrm share/examples/qt4/examples/declarative/toys
+@dirrm share/examples/qt4/examples/declarative/touchinteraction/pincharea
@dirrm share/examples/qt4/examples/declarative/touchinteraction/mousearea
@dirrm share/examples/qt4/examples/declarative/touchinteraction/gestures
@dirrm share/examples/qt4/examples/declarative/touchinteraction
@@ -4007,6 +4076,9 @@ share/examples/qt4/examples/xmlpatterns/xquery/xquery.pro
@dirrm share/examples/qt4/examples/declarative/text/fonts
@dirrm share/examples/qt4/examples/declarative/text
@dirrm share/examples/qt4/examples/declarative/sqllocalstorage
+@dirrm share/examples/qt4/examples/declarative/shadereffects/qml/images
+@dirrm share/examples/qt4/examples/declarative/shadereffects/qml
+@dirrm share/examples/qt4/examples/declarative/shadereffects
@dirrm share/examples/qt4/examples/declarative/positioners
@dirrm share/examples/qt4/examples/declarative/plugins/com/nokia/TimeExample
@dirrm share/examples/qt4/examples/declarative/plugins/com/nokia
diff --git a/www/qt4-webkit/Makefile b/www/qt4-webkit/Makefile
index 13b8a1b5982a..38109bc25b0b 100644
--- a/www/qt4-webkit/Makefile
+++ b/www/qt4-webkit/Makefile
@@ -14,11 +14,11 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Qt4 WebKit engine
USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build corelib declarative gui \
- network xml dbus phonon phonon-gst script scripttools \
- xmlpatterns
+QT_COMPONENTS= corelib declarative gui network phonon \
+ qmake_build moc_build rcc_build
QT_NONSTANDARD= yes
QT_DIST= yes
+USE_XORG= xrender
MAKE_JOBS_SAFE= yes
HAS_CONFIGURE= yes
@@ -65,7 +65,7 @@ post-configure:
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
${WRKSRC}/lib/pkgconfig/QtWebKit.pc
-#QtWebKit is statically linked with jscore, remove the latest
+# QtWebKit is statically linked with jscore, remove the latest.
${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||;s|-ljscore||' \
${WRKSRC}/lib/pkgconfig/QtWebKit.pc \
${WRKSRC}/lib/libQtWebKit.la
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 13:14:33 +0000