Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	sync.profile

Change-Id: Ib872687957e2de85267a0415209a58a733c41c24

239 files changed, 1808 insertions, 261 deletions

diff --git a/.gitignore b/.gitignore
index b406ebe..5ebb852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -258,3 +258,6 @@ src/xml/lib/
 *.dep
 *.map
 work
+
+# Generated static plugin import sources
+*_plugin_import.cpp
diff --git a/.qmake.conf b/.qmake.conf
index 42ba8e4..5de255c 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1 +1,2 @@
 load(qt_build_config)
+CONFIG += qt_example_installs
diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
new file mode 100644
index 0000000..cc5a670
--- /dev/null
+++ b/dist/changes-5.0.1
@@ -0,0 +1,51 @@
+Qt 5.0.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.0.0.
+
+For more details, refer to the online documentation included in this
+distribution. The documentation is also available online:
+
+  http://qt-project.org/doc/qt-5.0/
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+  http://bugreports.qt-project.org/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+
+****************************************************************************
+*                           General                                        *
+****************************************************************************
+
+General Improvements
+--------------------
+
+Third party components
+----------------------
+
+****************************************************************************
+*                          Library                                         *
+****************************************************************************
+
+
+****************************************************************************
+*                      Platform Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                      Compiler Specific Changes                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Tools                                           *
+****************************************************************************
+
+
+****************************************************************************
+*                          Plugins                                         *
+****************************************************************************
+
diff --git a/doc/doc.pro b/doc/doc.pro
new file mode 100644
index 0000000..2f52f3d
--- /dev/null
+++ b/doc/doc.pro
@@ -0,0 +1,2 @@
+TEMPLATE = aux
+QMAKE_DOCS = $$PWD/qtwebkitexamples.qdocconf
diff --git a/doc/images/webkit-examples.png b/doc/images/webkit-examples.png
new file mode 100644
index 0000000..23ddf1c
--- /dev/null
+++ b/doc/images/webkit-examples.png
diff --git a/doc/qtwebkitexamples.qdocconf b/doc/qtwebkitexamples.qdocconf
new file mode 100644
index 0000000..5ae4a02
--- /dev/null
+++ b/doc/qtwebkitexamples.qdocconf
@@ -0,0 +1,36 @@
+include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
+
+project     = QtWebKitExamples
+description = "Qt WebKit Examples and Demos Documentation"
+url                     = http://qt-project.org/doc/qt-5.0/qtwebkitexamples
+version     = 5.0.1
+
+# Defines the name of the project. You cannot use operators (+, =, -) in
+# the name. Properties for this project are set using a qhp.<projectname>.property
+# format.
+
+qhp.projects = QtWebKitExamples
+
+qhp.QtWebKitExamples.file = qtwebkitexamples.qhp
+qhp.QtWebKitExamples.namespace = org.qt-project.qtwebkitexamples.500
+qhp.QtWebKitExamples.indexTitle = Qt WebKit Examples
+qhp.QtWebKitExamples.virtualFolder  = qtwebkitexamples
+qhp.QtWebKitExamples.indexRoot  =
+qhp.QtWebKitExamples.filterAttributes    = qtwebkitexamples 5.0.1 qtrefdoc
+qhp.QtWebKitExamples.customFilters.Qt.name = QtWebKit 5.0.1
+qhp.QtWebKitExamples.customFilters.Qt.filterAttributes = qtwebkitexamples 5.0.1
+
+qhp.QtWebKitExamples.subprojects = manual
+qhp.QtWebKitExamples.subprojects.manual.title = Qt WebKit Examples
+qhp.QtWebKitExamples.subprojects.manual.indexTitle = Qt WebKit Examples
+qhp.QtWebKitExamples.subprojects.manual.type = manual
+
+outputdir = $QT_INSTALL_DOCS/qtwebkitexamples
+
+depends += qtcore qtwidgets qtquick qtgui qtscript qtdoc qtxml qtwebkitwidgets qtwebkit
+
+exampledirs = ../examples
+
+sourcedirs = src
+
+imagedirs = images
diff --git a/doc/src/qtwebkit-examples.qdoc b/doc/src/qtwebkit-examples.qdoc
new file mode 100644
index 0000000..2737d58
--- /dev/null
+++ b/doc/src/qtwebkit-examples.qdoc
@@ -0,0 +1,70 @@
+****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \page qtwebkitexamples-index.html
+    \title Qt WebKit Examples
+    \brief Provides examples demonstrating the WebKit features
+
+    Qt WebKit Examples provide QML-based examples that demonstrate the WebKit2
+    features, and also QWidget-based examples that demonstrate the Webkit1
+    features.
+
+    \section1 WebKit2 Examples
+    \annotatedlist webkit-qmlexamples
+
+    \section1 WebKit1 Examples
+    \annotatedlist webkit-widgetexamples
+
+    \sa {Qt WebKit}
+*/
+
+/*!
+    \group webkit-widgetexamples
+    \title Qt WebKit Widgets Examples
+    \brief Examples demonstrating the webkit widgets usage
+    \ingroup all-examples
+
+    \image webkit-examples.png WebKit
+
+    Qt provides an integrated Web browser component based on WebKit, the popular
+    open source browser engine.
+
+    These examples and demonstrations show a range of different uses for WebKit,
+    from displaying Web pages within a Qt user interface to an implementation of
+    a basic function Web browser.
+*/
+
+/*!
+    \group webkit-qmlexamples
+    \title Qt Webkit Examples and Demos
+    \brief QML examples demonstrating Webkit features
+    \ingroup all-examples
+
+    These examples demonstrate how to embed a WebView within a Qt Quick
+    application.
+*/
diff --git a/examples/examples.pro b/examples/examples.pro
index 06a2000..2bcd42a 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  browser embedded scroller webkit xmlpatterns qml
+SUBDIRS +=  webkitwidgets webkitqml
diff --git a/examples/qml/flickrview/flickrview.pro b/examples/qml/flickrview/flickrview.pro
deleted file mode 100644
index 09b2f69..0000000
--- a/examples/qml/flickrview/flickrview.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-
-DEFINES += QWEBKIT_EXAMPLE_NAME=\\\"flickrview\\\"
-
-QT += quick qml webkitwidgets
-SOURCES += ../shared/main.cpp
-
-mac: CONFIG -= app_bundle
-
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/flickrview
-qml.files = flickrview.qml
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/flickrview
-INSTALLS += target qml
diff --git a/examples/scroller/plot/plot.pro b/examples/scroller/plot/plot.pro
deleted file mode 100644
index f93da29..0000000
--- a/examples/scroller/plot/plot.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-HEADERS       = settingswidget.h \
-                plotwidget.h
-SOURCES       = settingswidget.cpp \
-                plotwidget.cpp \
-                main.cpp
-
-QT += webkitwidgets widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/plot
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plot.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/plot
-INSTALLS += target sources
diff --git a/examples/scroller/wheel/wheel.pro b/examples/scroller/wheel/wheel.pro
deleted file mode 100644
index f0e3a66..0000000
--- a/examples/scroller/wheel/wheel.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-HEADERS       = wheelwidget.h
-SOURCES       = wheelwidget.cpp \
-                main.cpp
-
-QT += webkitwidgets widgets
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/wheel
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wheel.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/scroller/wheel
-INSTALLS += target sources
diff --git a/examples/webkit/domtraversal/domtraversal.pro b/examples/webkit/domtraversal/domtraversal.pro
deleted file mode 100644
index cd0811f..0000000
--- a/examples/webkit/domtraversal/domtraversal.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT       += webkitwidgets network widgets
-FORMS     = window.ui
-HEADERS   = window.h
-SOURCES   = main.cpp \
-            window.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/domtraversal
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/domtraversal
-INSTALLS += target sources
diff --git a/examples/webkit/fancybrowser/fancybrowser.pro b/examples/webkit/fancybrowser/fancybrowser.pro
deleted file mode 100644
index 4d23d51..0000000
--- a/examples/webkit/fancybrowser/fancybrowser.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT      +=  webkitwidgets network widgets
-HEADERS =   mainwindow.h
-SOURCES =   main.cpp \
-            mainwindow.cpp
-RESOURCES = jquery.qrc
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/fancybrowser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/fancybrowser
-INSTALLS += target sources
diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro
deleted file mode 100644
index c02dadd..0000000
--- a/examples/webkit/framecapture/framecapture.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT      += webkitwidgets network widgets
-
-HEADERS = framecapture.h
-SOURCES = main.cpp \
-          framecapture.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/framecapture
-sources.files = $$SOURCES $$HEADERS
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/framecapture
-INSTALLS += target sources
diff --git a/examples/webkit/previewer/previewer.pro b/examples/webkit/previewer/previewer.pro
deleted file mode 100644
index 8a9eb0c..0000000
--- a/examples/webkit/previewer/previewer.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-QT      +=  webkitwidgets network widgets
-HEADERS =   previewer.h \
-            mainwindow.h
-SOURCES =   main.cpp \
-            previewer.cpp \
-            mainwindow.cpp
-FORMS   =   previewer.ui
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/previewer
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/previewer
-INSTALLS += target sources
diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro
deleted file mode 100644
index 97cefbc..0000000
--- a/examples/webkit/simpleselector/simpleselector.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-QT       += webkitwidgets network widgets
-FORMS     = window.ui
-HEADERS   = window.h
-SOURCES   = main.cpp \
-            window.cpp
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/simpleselector
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/simpleselector
-INSTALLS += target sources
diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro
deleted file mode 100644
index a721890..0000000
--- a/examples/webkit/webkit.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE =  subdirs
-SUBDIRS +=  domtraversal \
-            formextractor \
-            previewer \
-            fancybrowser \
-            simpleselector \
-            imageanalyzer \
-            framecapture \
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS webkit.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit
-INSTALLS += target sources
diff --git a/examples/webkitqml/flickrview/doc/images/flickrview-example.png b/examples/webkitqml/flickrview/doc/images/flickrview-example.png
new file mode 100644
index 0000000..4e444dc
--- /dev/null
+++ b/examples/webkitqml/flickrview/doc/images/flickrview-example.png
diff --git a/examples/webkitqml/flickrview/doc/src/flickrview.qdoc b/examples/webkitqml/flickrview/doc/src/flickrview.qdoc
new file mode 100644
index 0000000..a1077b6
--- /dev/null
+++ b/examples/webkitqml/flickrview/doc/src/flickrview.qdoc
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitqml/flickrview
+    \title Flickr View Example
+    \brief Demonstrates how to embed a web view in a Qt Quick application
+    \ingroup webkit-qmlexamples
+
+    The Flickr View Qt Quick example uses a \l{WebView} to browse the images
+    from the \l{http://flickr.com}{Flickr} public RSS feed.
+
+    \image flickrview-example.png
+
+    FlickrView is an example that retrieves the \l{http://www.flickr.com/services/feeds/docs/photos_public}{flickr.com RSS feed of public photos}
+    utilizing an \l{XmlListModel} and shows the thumbnails in a \l{ListView}.
+    When clicking on a thumbnail in the list at the bottom, the full size
+    image is loaded in a \l{WebView} using the corresponding Flickr link for it.
+    It is also possible to browse the profile of Flickr users in the WebView like in a
+    normal browser. This demonstrates how navigaton can be restricted to a specific
+    domain in the \c{onNavigationRequested} signal.
+    The feed can be updated using pull-to-refresh at the end of the thumbnail list.
+
+    This example uses the QtWebKit QML API that utilizes the WebKit2 split-process architecture.
+*/
diff --git a/examples/webkitqml/flickrview/flickrview.pro b/examples/webkitqml/flickrview/flickrview.pro
new file mode 100644
index 0000000..33d9320
--- /dev/null
+++ b/examples/webkitqml/flickrview/flickrview.pro
@@ -0,0 +1,13 @@
+TEMPLATE = app
+
+DEFINES += QWEBKIT_EXAMPLE_NAME=\\\"flickrview\\\"
+
+QT += quick qml webkit
+SOURCES += ../shared/main.cpp
+
+mac: CONFIG -= app_bundle
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/flickrview
+qml.files = flickrview.qml
+qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/flickrview
+INSTALLS += target qml
diff --git a/examples/qml/flickrview/flickrview.qml b/examples/webkitqml/flickrview/flickrview.qml
index 6592864..e5e3dfd 100644
--- a/examples/qml/flickrview/flickrview.qml
+++ b/examples/webkitqml/flickrview/flickrview.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/qml/flickrview/flickrview.qmlproject b/examples/webkitqml/flickrview/flickrview.qmlproject
index 7f47c02..7f47c02 100644
--- a/examples/qml/flickrview/flickrview.qmlproject
+++ b/examples/webkitqml/flickrview/flickrview.qmlproject
diff --git a/examples/qml/shared/Button.qml b/examples/webkitqml/shared/Button.qml
index 47dff90..68abf4d 100644
--- a/examples/qml/shared/Button.qml
+++ b/examples/webkitqml/shared/Button.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/qml/shared/LoadIndicator.qml b/examples/webkitqml/shared/LoadIndicator.qml
index ff92e4a..6d972e9 100644
--- a/examples/qml/shared/LoadIndicator.qml
+++ b/examples/webkitqml/shared/LoadIndicator.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/qml/shared/images/arrow.png b/examples/webkitqml/shared/images/arrow.png
index 1dcec44..1dcec44 100644
--- a/examples/qml/shared/images/arrow.png
+++ b/examples/webkitqml/shared/images/arrow.png
diff --git a/examples/qml/shared/images/busy.png b/examples/webkitqml/shared/images/busy.png
index 664c2b1..664c2b1 100644
--- a/examples/qml/shared/images/busy.png
+++ b/examples/webkitqml/shared/images/busy.png
diff --git a/examples/qml/shared/images/flickr.png b/examples/webkitqml/shared/images/flickr.png
index d0f0502..d0f0502 100644
--- a/examples/qml/shared/images/flickr.png
+++ b/examples/webkitqml/shared/images/flickr.png
diff --git a/examples/qml/shared/images/less.png b/examples/webkitqml/shared/images/less.png
index 136919b..136919b 100644
--- a/examples/qml/shared/images/less.png
+++ b/examples/webkitqml/shared/images/less.png
diff --git a/examples/qml/shared/images/more.png b/examples/webkitqml/shared/images/more.png
index fe7f87e..fe7f87e 100644
--- a/examples/qml/shared/images/more.png
+++ b/examples/webkitqml/shared/images/more.png
diff --git a/examples/qml/shared/main.cpp b/examples/webkitqml/shared/main.cpp
index 4be3b2a..c77a22b 100644
--- a/examples/qml/shared/main.cpp
+++ b/examples/webkitqml/shared/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -43,7 +43,7 @@ int main(int argc, char* argv[])
 {
     QGuiApplication app(argc,argv);
     QQuickView view;
-    view.setSource(QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + QLatin1String("/"QWEBKIT_EXAMPLE_NAME".qml")));
+    view.setSource(QUrl::fromLocalFile(QCoreApplication::applicationDirPath() + QLatin1String("/" QWEBKIT_EXAMPLE_NAME ".qml")));
     view.setResizeMode(QQuickView::SizeRootObjectToView);
     view.show();
     return app.exec();
diff --git a/examples/qml/shared/qmldir b/examples/webkitqml/shared/qmldir
index ffd9414..ffd9414 100644
--- a/examples/qml/shared/qmldir
+++ b/examples/webkitqml/shared/qmldir
diff --git a/examples/qml/shared/shared.pro b/examples/webkitqml/shared/shared.pro
index f40ebb0..06841c7 100644
--- a/examples/qml/shared/shared.pro
+++ b/examples/webkitqml/shared/shared.pro
@@ -7,5 +7,5 @@ qml.files = images \
             main.cpp \
             qmldir
 
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/shared
+qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/shared
 INSTALLS = qml
diff --git a/examples/qml/qml.pro b/examples/webkitqml/webkitqml.pro
index 9513539..9513539 100644
--- a/examples/qml/qml.pro
+++ b/examples/webkitqml/webkitqml.pro
diff --git a/examples/qml/youtubeview/content/YouTubeDialog.qml b/examples/webkitqml/youtubeview/content/YouTubeDialog.qml
index 2d46474..b02400e 100644
--- a/examples/qml/youtubeview/content/YouTubeDialog.qml
+++ b/examples/webkitqml/youtubeview/content/YouTubeDialog.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/qml/youtubeview/content/player.html b/examples/webkitqml/youtubeview/content/player.html
index 6f3a1e9..6f3a1e9 100644
--- a/examples/qml/youtubeview/content/player.html
+++ b/examples/webkitqml/youtubeview/content/player.html
diff --git a/examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png b/examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png
new file mode 100644
index 0000000..ba93e4d
--- /dev/null
+++ b/examples/webkitqml/youtubeview/doc/images/youtubeview-example-preset.png
diff --git a/examples/webkitqml/youtubeview/doc/images/youtubeview-example.png b/examples/webkitqml/youtubeview/doc/images/youtubeview-example.png
new file mode 100644
index 0000000..1b561ed
--- /dev/null
+++ b/examples/webkitqml/youtubeview/doc/images/youtubeview-example.png
diff --git a/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc b/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc
new file mode 100644
index 0000000..8209c05
--- /dev/null
+++ b/examples/webkitqml/youtubeview/doc/src/youtubeview.qdoc
@@ -0,0 +1,56 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitqml/youtubeview
+    \title YouTube View Example
+    \brief Demonstrates how to embed a web view in a Qt Quick application
+    \ingroup webkit-qmlexamples
+
+    The YouTube View \l{Qt QML}{QML} example uses a \l{WebView} to play
+    \l{http://www.youtube.com/html5}{HTML5 video clips from YouTube}.
+
+    \image youtubeview-example.png
+
+    The applicaiton makes use of an \l{XmlListModel} to query the \l{https://developers.google.com/youtube}{YouTube API}
+    for HTML5 video clips and lists thumbnails of the clips in a \l{ListView} at the top. The \l{WebView} loads a local \c player.html file that
+    embeds a YouTube HTML5 video player using the \l{https://developers.google.com/youtube/iframe_api_reference}{IFrame player API},
+    which allows to control the YouTube player using JavaScript.
+
+    When clicking on a thumbnail, the corresponding clip is loaded in the WebView by passing the video ID as a query string to \c player.html.
+    When the video is started, the thumbnail list is hidden with an animated fade-out, when the video is stopped the list is showed again.
+    The specific states of the player change the title of the WebView using \e{document.title} in JavaScript. The application
+    is acting on these title changes in the \c{onTitleChanged} slot of the WebView item and thus switches between specific states.
+    By default the application loads a list of movie trailers.
+
+    When clicking on the button below the thumbnail list, the application switches to search mode, which allows to search for videos
+    using keywords. Additionally it is also possible to choose from a number of preset movie trailer streams.
+
+    \image youtubeview-example-preset.png
+
+    This example uses the QtWebKit QML API that utilizes the WebKit2 split-process architecture.
+*/
diff --git a/examples/qml/youtubeview/youtubeview.pro b/examples/webkitqml/youtubeview/youtubeview.pro
index 8d79eab..cdc71e9 100644
--- a/examples/qml/youtubeview/youtubeview.pro
+++ b/examples/webkitqml/youtubeview/youtubeview.pro
@@ -2,14 +2,14 @@ TEMPLATE = app
 
 DEFINES += QWEBKIT_EXAMPLE_NAME=\\\"youtubeview\\\"
 
-QT += quick qml webkitwidgets
+QT += quick qml webkit
 SOURCES += ../shared/main.cpp
 
 mac: CONFIG -= app_bundle
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/youtubeview
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/youtubeview
 qml.files = youtubeview.qml content
-qml.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/examples/qml/youtubeview
+qml.path = $$[QT_INSTALL_EXAMPLES]/webkitqml/youtubeview
 INSTALLS += target qml
 
 OTHER_FILES += \
diff --git a/examples/qml/youtubeview/youtubeview.qml b/examples/webkitqml/youtubeview/youtubeview.qml
index 4b1dacf..b002319 100644
--- a/examples/qml/youtubeview/youtubeview.qml
+++ b/examples/webkitqml/youtubeview/youtubeview.qml
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/qml/youtubeview/youtubeview.qmlproject b/examples/webkitqml/youtubeview/youtubeview.qmlproject
index 51f0a40..51f0a40 100644
--- a/examples/qml/youtubeview/youtubeview.qmlproject
+++ b/examples/webkitqml/youtubeview/youtubeview.qmlproject
diff --git a/examples/browser/Info_mac.plist b/examples/webkitwidgets/browser/Info_mac.plist
index a4731c2..a4731c2 100644
--- a/examples/browser/Info_mac.plist
+++ b/examples/webkitwidgets/browser/Info_mac.plist
diff --git a/examples/browser/addbookmarkdialog.ui b/examples/webkitwidgets/browser/addbookmarkdialog.ui
index 3460d7b..3460d7b 100644
--- a/examples/browser/addbookmarkdialog.ui
+++ b/examples/webkitwidgets/browser/addbookmarkdialog.ui
diff --git a/examples/browser/autosaver.cpp b/examples/webkitwidgets/browser/autosaver.cpp
index eefe1f7..532bd8d 100644
--- a/examples/browser/autosaver.cpp
+++ b/examples/webkitwidgets/browser/autosaver.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/autosaver.h b/examples/webkitwidgets/browser/autosaver.h
index a171937..2c7c6a4 100644
--- a/examples/browser/autosaver.h
+++ b/examples/webkitwidgets/browser/autosaver.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/bookmarks.cpp b/examples/webkitwidgets/browser/bookmarks.cpp
index 4431e98..9237406 100644
--- a/examples/browser/bookmarks.cpp
+++ b/examples/webkitwidgets/browser/bookmarks.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/bookmarks.h b/examples/webkitwidgets/browser/bookmarks.h
index f7a2fa1..be29666 100644
--- a/examples/browser/bookmarks.h
+++ b/examples/webkitwidgets/browser/bookmarks.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/bookmarks.ui b/examples/webkitwidgets/browser/bookmarks.ui
index c893e94..c893e94 100644
--- a/examples/browser/bookmarks.ui
+++ b/examples/webkitwidgets/browser/bookmarks.ui
diff --git a/examples/browser/browser.icns b/examples/webkitwidgets/browser/browser.icns
index f591ae4..f591ae4 100644
--- a/examples/browser/browser.icns
+++ b/examples/webkitwidgets/browser/browser.icns
diff --git a/examples/browser/browser.ico b/examples/webkitwidgets/browser/browser.ico
index 7f9be93..7f9be93 100644
--- a/examples/browser/browser.ico
+++ b/examples/webkitwidgets/browser/browser.ico
diff --git a/examples/browser/browser.pro b/examples/webkitwidgets/browser/browser.pro
index a5b486c..97559ed 100644
--- a/examples/browser/browser.pro
+++ b/examples/webkitwidgets/browser/browser.pro
@@ -2,8 +2,7 @@ TEMPLATE = app
 TARGET = browser
 QT += webkitwidgets network widgets printsupport
 
-CONFIG += qt warn_on
-!isEmpty(QT.uitools.name):!embedded: QT += uitools
+qtHaveModule(uitools):!embedded: QT += uitools
 else: DEFINES += QT_NO_UITOOLS
 
 FORMS += \
@@ -94,8 +93,8 @@ wince*: {
     DEPLOYMENT_PLUGIN += qjpeg qgif
 }
 
+EXAMPLE_FILES = Info_mac.plist browser.icns browser.ico browser.rc
+
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/browser
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.plist *.icns *.ico *.rc *.pro *.html *.doc images htmls data
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/browser
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/browser
+INSTALLS += target
diff --git a/examples/browser/browser.rc b/examples/webkitwidgets/browser/browser.rc
index 89a237c..89a237c 100644
--- a/examples/browser/browser.rc
+++ b/examples/webkitwidgets/browser/browser.rc
diff --git a/examples/browser/browserapplication.cpp b/examples/webkitwidgets/browser/browserapplication.cpp
index f08c489..0e281de 100644
--- a/examples/browser/browserapplication.cpp
+++ b/examples/webkitwidgets/browser/browserapplication.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/browserapplication.h b/examples/webkitwidgets/browser/browserapplication.h
index d322607..d4b89aa 100644
--- a/examples/browser/browserapplication.h
+++ b/examples/webkitwidgets/browser/browserapplication.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/browsermainwindow.cpp b/examples/webkitwidgets/browser/browsermainwindow.cpp
index 9561a3d..ad9dc52 100644
--- a/examples/browser/browsermainwindow.cpp
+++ b/examples/webkitwidgets/browser/browsermainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/browsermainwindow.h b/examples/webkitwidgets/browser/browsermainwindow.h
index 8a93a14..41ae0a5 100644
--- a/examples/browser/browsermainwindow.h
+++ b/examples/webkitwidgets/browser/browsermainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/chasewidget.cpp b/examples/webkitwidgets/browser/chasewidget.cpp
index 7ab98ee..a8433ad 100644
--- a/examples/browser/chasewidget.cpp
+++ b/examples/webkitwidgets/browser/chasewidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/chasewidget.h b/examples/webkitwidgets/browser/chasewidget.h
index ba98c3b..2c57d08 100644
--- a/examples/browser/chasewidget.h
+++ b/examples/webkitwidgets/browser/chasewidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/cookiejar.cpp b/examples/webkitwidgets/browser/cookiejar.cpp
index d2d72ef..e70ac07 100644
--- a/examples/browser/cookiejar.cpp
+++ b/examples/webkitwidgets/browser/cookiejar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/cookiejar.h b/examples/webkitwidgets/browser/cookiejar.h
index 3029c38..ab5c6a9 100644
--- a/examples/browser/cookiejar.h
+++ b/examples/webkitwidgets/browser/cookiejar.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/cookies.ui b/examples/webkitwidgets/browser/cookies.ui
index c4bccc5..c4bccc5 100644
--- a/examples/browser/cookies.ui
+++ b/examples/webkitwidgets/browser/cookies.ui
diff --git a/examples/browser/cookiesexceptions.ui b/examples/webkitwidgets/browser/cookiesexceptions.ui
index 3d9ef62..3d9ef62 100644
--- a/examples/browser/cookiesexceptions.ui
+++ b/examples/webkitwidgets/browser/cookiesexceptions.ui
diff --git a/examples/browser/data/addtab.png b/examples/webkitwidgets/browser/data/addtab.png
index 20928fb..20928fb 100644
--- a/examples/browser/data/addtab.png
+++ b/examples/webkitwidgets/browser/data/addtab.png
diff --git a/examples/browser/data/browser.svg b/examples/webkitwidgets/browser/data/browser.svg
index 9908aed..1508a41 100644
--- a/examples/browser/data/browser.svg
+++ b/examples/webkitwidgets/browser/data/browser.svg
@@ -276,7 +276,7 @@
         </dc:creator>
         <dc:rights>
           <cc:Agent>
-            <dc:title>Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).</dc:title>
+            <dc:title>Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).</dc:title>
           </cc:Agent>
         </dc:rights>
       </cc:Work>
diff --git a/examples/browser/data/closetab.png b/examples/webkitwidgets/browser/data/closetab.png
index ab9d669..ab9d669 100644
--- a/examples/browser/data/closetab.png
+++ b/examples/webkitwidgets/browser/data/closetab.png
diff --git a/examples/browser/data/data.qrc b/examples/webkitwidgets/browser/data/data.qrc
index c7d0294..c7d0294 100644
--- a/examples/browser/data/data.qrc
+++ b/examples/webkitwidgets/browser/data/data.qrc
diff --git a/examples/browser/data/defaultbookmarks.xbel b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel
index 7a95e36..7a95e36 100644
--- a/examples/browser/data/defaultbookmarks.xbel
+++ b/examples/webkitwidgets/browser/data/defaultbookmarks.xbel
diff --git a/examples/browser/data/defaulticon.png b/examples/webkitwidgets/browser/data/defaulticon.png
index 01a0920..01a0920 100644
--- a/examples/browser/data/defaulticon.png
+++ b/examples/webkitwidgets/browser/data/defaulticon.png
diff --git a/examples/browser/data/history.png b/examples/webkitwidgets/browser/data/history.png
index 552a1cb..552a1cb 100644
--- a/examples/browser/data/history.png
+++ b/examples/webkitwidgets/browser/data/history.png
diff --git a/examples/browser/data/loading.gif b/examples/webkitwidgets/browser/data/loading.gif
index c1545eb..c1545eb 100644
--- a/examples/browser/data/loading.gif
+++ b/examples/webkitwidgets/browser/data/loading.gif
diff --git a/examples/webkitwidgets/browser/doc/images/browser-demo.png b/examples/webkitwidgets/browser/doc/images/browser-demo.png
new file mode 100644
index 0000000..09d0650
--- /dev/null
+++ b/examples/webkitwidgets/browser/doc/images/browser-demo.png
diff --git a/examples/webkitwidgets/browser/doc/src/browser.qdoc b/examples/webkitwidgets/browser/doc/src/browser.qdoc
new file mode 100644
index 0000000..4e53de3
--- /dev/null
+++ b/examples/webkitwidgets/browser/doc/src/browser.qdoc
@@ -0,0 +1,41 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/browser
+    \title Tab Browser
+    \brief Demonstrates a complete web browsing experience
+    \ingroup webkit-widgetexamples
+
+    The Tab Browser example shows \l{Qt WebKit} module in action,
+    providing a little Web browser application with support for tabs.
+
+    \image browser-demo.png
+
+    This browser is the foundation for the \l{Arora Browser}, a simple cross-platform
+    Web browser.
+*/
diff --git a/examples/browser/downloaditem.ui b/examples/webkitwidgets/browser/downloaditem.ui
index 4a0a0fd..4a0a0fd 100644
--- a/examples/browser/downloaditem.ui
+++ b/examples/webkitwidgets/browser/downloaditem.ui
diff --git a/examples/browser/downloadmanager.cpp b/examples/webkitwidgets/browser/downloadmanager.cpp
index 93c9cc4..dcb89eb 100644
--- a/examples/browser/downloadmanager.cpp
+++ b/examples/webkitwidgets/browser/downloadmanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/downloadmanager.h b/examples/webkitwidgets/browser/downloadmanager.h
index 5decb3a..1f21238 100644
--- a/examples/browser/downloadmanager.h
+++ b/examples/webkitwidgets/browser/downloadmanager.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/downloads.ui b/examples/webkitwidgets/browser/downloads.ui
index a2e2569..a2e2569 100644
--- a/examples/browser/downloads.ui
+++ b/examples/webkitwidgets/browser/downloads.ui
diff --git a/examples/browser/edittableview.cpp b/examples/webkitwidgets/browser/edittableview.cpp
index 5415967..7d9aeea 100644
--- a/examples/browser/edittableview.cpp
+++ b/examples/webkitwidgets/browser/edittableview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/edittableview.h b/examples/webkitwidgets/browser/edittableview.h
index fa465ea..79548bb 100644
--- a/examples/browser/edittableview.h
+++ b/examples/webkitwidgets/browser/edittableview.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/edittreeview.cpp b/examples/webkitwidgets/browser/edittreeview.cpp
index dfe27ad..06ab77a 100644
--- a/examples/browser/edittreeview.cpp
+++ b/examples/webkitwidgets/browser/edittreeview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/edittreeview.h b/examples/webkitwidgets/browser/edittreeview.h
index 166aaad..c2a180f 100644
--- a/examples/browser/edittreeview.h
+++ b/examples/webkitwidgets/browser/edittreeview.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/history.cpp b/examples/webkitwidgets/browser/history.cpp
index 11a42f2..d241994 100644
--- a/examples/browser/history.cpp
+++ b/examples/webkitwidgets/browser/history.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/history.h b/examples/webkitwidgets/browser/history.h
index 0add405..ee8bcc4 100644
--- a/examples/browser/history.h
+++ b/examples/webkitwidgets/browser/history.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/history.ui b/examples/webkitwidgets/browser/history.ui
index 0944940..0944940 100644
--- a/examples/browser/history.ui
+++ b/examples/webkitwidgets/browser/history.ui
diff --git a/examples/browser/htmls/htmls.qrc b/examples/webkitwidgets/browser/htmls/htmls.qrc
index 03b256c..03b256c 100644
--- a/examples/browser/htmls/htmls.qrc
+++ b/examples/webkitwidgets/browser/htmls/htmls.qrc
diff --git a/examples/browser/htmls/notfound.html b/examples/webkitwidgets/browser/htmls/notfound.html
index e89845a..e89845a 100644
--- a/examples/browser/htmls/notfound.html
+++ b/examples/webkitwidgets/browser/htmls/notfound.html
diff --git a/examples/browser/main.cpp b/examples/webkitwidgets/browser/main.cpp
index 1480c66..ae54456 100644
--- a/examples/browser/main.cpp
+++ b/examples/webkitwidgets/browser/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/modelmenu.cpp b/examples/webkitwidgets/browser/modelmenu.cpp
index 8226fb8..eae4190 100644
--- a/examples/browser/modelmenu.cpp
+++ b/examples/webkitwidgets/browser/modelmenu.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/modelmenu.h b/examples/webkitwidgets/browser/modelmenu.h
index e28861d..de8aa00 100644
--- a/examples/browser/modelmenu.h
+++ b/examples/webkitwidgets/browser/modelmenu.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/networkaccessmanager.cpp b/examples/webkitwidgets/browser/networkaccessmanager.cpp
index b4d635f..f6c858a 100644
--- a/examples/browser/networkaccessmanager.cpp
+++ b/examples/webkitwidgets/browser/networkaccessmanager.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/networkaccessmanager.h b/examples/webkitwidgets/browser/networkaccessmanager.h
index 9dde549..8a7aaf8 100644
--- a/examples/browser/networkaccessmanager.h
+++ b/examples/webkitwidgets/browser/networkaccessmanager.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/passworddialog.ui b/examples/webkitwidgets/browser/passworddialog.ui
index 7c16658..7c16658 100644
--- a/examples/browser/passworddialog.ui
+++ b/examples/webkitwidgets/browser/passworddialog.ui
diff --git a/examples/browser/proxy.ui b/examples/webkitwidgets/browser/proxy.ui
index 62a8be6..62a8be6 100644
--- a/examples/browser/proxy.ui
+++ b/examples/webkitwidgets/browser/proxy.ui
diff --git a/examples/browser/searchlineedit.cpp b/examples/webkitwidgets/browser/searchlineedit.cpp
index 06f14a4..d22e6b2 100644
--- a/examples/browser/searchlineedit.cpp
+++ b/examples/webkitwidgets/browser/searchlineedit.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/searchlineedit.h b/examples/webkitwidgets/browser/searchlineedit.h
index 5e50bb1..89270f7 100644
--- a/examples/browser/searchlineedit.h
+++ b/examples/webkitwidgets/browser/searchlineedit.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/settings.cpp b/examples/webkitwidgets/browser/settings.cpp
index 501c890..a45e42f 100644
--- a/examples/browser/settings.cpp
+++ b/examples/webkitwidgets/browser/settings.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/settings.h b/examples/webkitwidgets/browser/settings.h
index 93719fe..e118e7f 100644
--- a/examples/browser/settings.h
+++ b/examples/webkitwidgets/browser/settings.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/settings.ui b/examples/webkitwidgets/browser/settings.ui
index 3491ce0..3491ce0 100644
--- a/examples/browser/settings.ui
+++ b/examples/webkitwidgets/browser/settings.ui
diff --git a/examples/browser/squeezelabel.cpp b/examples/webkitwidgets/browser/squeezelabel.cpp
index ff133eb..bdb292e 100644
--- a/examples/browser/squeezelabel.cpp
+++ b/examples/webkitwidgets/browser/squeezelabel.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/squeezelabel.h b/examples/webkitwidgets/browser/squeezelabel.h
index f3407c2..ccaf081 100644
--- a/examples/browser/squeezelabel.h
+++ b/examples/webkitwidgets/browser/squeezelabel.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/tabwidget.cpp b/examples/webkitwidgets/browser/tabwidget.cpp
index b706959..f30e71c 100644
--- a/examples/browser/tabwidget.cpp
+++ b/examples/webkitwidgets/browser/tabwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/tabwidget.h b/examples/webkitwidgets/browser/tabwidget.h
index 29b518b..04b9134 100644
--- a/examples/browser/tabwidget.h
+++ b/examples/webkitwidgets/browser/tabwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/toolbarsearch.cpp b/examples/webkitwidgets/browser/toolbarsearch.cpp
index 33bc51c..84e4d45 100644
--- a/examples/browser/toolbarsearch.cpp
+++ b/examples/webkitwidgets/browser/toolbarsearch.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/toolbarsearch.h b/examples/webkitwidgets/browser/toolbarsearch.h
index bbf2973..7928e9c 100644
--- a/examples/browser/toolbarsearch.h
+++ b/examples/webkitwidgets/browser/toolbarsearch.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/urllineedit.cpp b/examples/webkitwidgets/browser/urllineedit.cpp
index 1fdc73d..47828d9 100644
--- a/examples/browser/urllineedit.cpp
+++ b/examples/webkitwidgets/browser/urllineedit.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/urllineedit.h b/examples/webkitwidgets/browser/urllineedit.h
index f9716fd..edb8880 100644
--- a/examples/browser/urllineedit.h
+++ b/examples/webkitwidgets/browser/urllineedit.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/webview.cpp b/examples/webkitwidgets/browser/webview.cpp
index 41c6558..6c65644 100644
--- a/examples/browser/webview.cpp
+++ b/examples/webkitwidgets/browser/webview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/webview.h b/examples/webkitwidgets/browser/webview.h
index c48d141..4fd04ac 100644
--- a/examples/browser/webview.h
+++ b/examples/webkitwidgets/browser/webview.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/xbel.cpp b/examples/webkitwidgets/browser/xbel.cpp
index e52afe1..ccc9c40 100644
--- a/examples/browser/xbel.cpp
+++ b/examples/webkitwidgets/browser/xbel.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/browser/xbel.h b/examples/webkitwidgets/browser/xbel.h
index a919def..6078c8d 100644
--- a/examples/browser/xbel.h
+++ b/examples/webkitwidgets/browser/xbel.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the demonstration applications of the Qt Toolkit.
diff --git a/examples/webkitwidgets/domtraversal/doc/images/webkit-domtraversal.png b/examples/webkitwidgets/domtraversal/doc/images/webkit-domtraversal.png
new file mode 100644
index 0000000..8b6f34a
--- /dev/null
+++ b/examples/webkitwidgets/domtraversal/doc/images/webkit-domtraversal.png
diff --git a/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc b/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
new file mode 100644
index 0000000..1fc482d
--- /dev/null
+++ b/examples/webkitwidgets/domtraversal/doc/src/domtraversal.qdoc
@@ -0,0 +1,127 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/domtraversal
+    \title DOM Traversal Example
+    \brief Demonstrates how to traverse the DOM tree
+    \ingroup webkit-widgetexamples
+
+    \brief The DOM Traversal example shows how to use the QWebElement class to access
+    the structure of a Web page.
+
+    \image webkit-domtraversal.png
+
+    The QWebElement class provides an API that can be used to examine the structure
+    and content of a Web page via a Document Object Model (DOM) interface. It can be
+    used for basic traversal of the document structure, to search for particular
+    elements (see the \l{Simple Selector Example}), and to modify content in-place.
+
+    This example uses a QWebView widget to display the Web page, and a dock widget
+    holds the QTreeWidget that shows the document structure. These widgets are
+    placed in an instance of the \c Window class, which we describe below.
+
+    \section1 Window Class Definition
+
+    The \c Window class is derived from QMainWindow and its user interface is created
+    using \l{Qt Designer}. As a result, the class is also derived from the user
+    interface class created by \l uic:
+
+    \snippet webkitwidgets/domtraversal/window.h Window class definition
+
+    Two important functions to note are the \c on_webView_loadFinished() slot and
+    the \c examineChildElements() function. The former is automatically called
+    when the QWebView widget finishes loading a page. See the
+    \l{#Further Reading}{Further Reading} section for more information on this
+    mechanism.
+
+    The \c examineChildElements() function is used to traverse the document structure
+    and add items to the QTreeWidget.
+
+    \section1 Window Class Implementation
+
+    In the \c Window class constructor, we call the \l{QWidget::}{setupUi()} function
+    to set up the user interface described in the \c{window.ui} file:
+
+    \snippet webkitwidgets/domtraversal/window.cpp Window constructor
+
+    When the Web page is loaded, the \c on_webView_loadFinished() slot is called. Here,
+    we clear the tree widget and begin inspection of the document by obtaining the
+    document element from the page's main frame:
+
+    \snippet webkitwidgets/domtraversal/window.cpp begin document inspection
+
+    At this point, we call the \c examineChildElements() function to traverse the
+    document, starting with the child elements of the document element for which we
+    will create top level items in the tree widget.
+
+    The \c examineChildElements() function accepts a parent element and a parent item.
+    Starting with the first child element, which we obtain with the element's
+    \l{QWebElement::}{firstChild()} function, we examine each child element of the
+    parent item. For each valid (non-null) element, which we check by calling its
+    \l{QWebElement::}{isNull()} function, we create a new QTreeWidgetItem instance with
+    the element name and add it to the parent item.
+
+    \snippet webkitwidgets/domtraversal/window.cpp traverse document
+
+    We recursively examine the child elements for each element by calling
+    \c examineChildElements() with the current child element and the newly-created item.
+    To obtain the next element at the same level in the document, we call its
+    \l{QWebElement::}{nextSibling()} function.
+
+    This recursive approach to reading the document makes it easy to create a simple
+    representation of the document structure in a tree widget.
+
+    For completeness, we show the \c setUrl() function, which is provided to allow the
+    document URL to be set from the example's \c main() function.
+
+    \snippet webkitwidgets/domtraversal/window.cpp set URL
+
+    \section1 Starting the Example
+
+    We set up the application, create
+    a \c Window instance, set its URL, and show it:
+
+    \snippet webkitwidgets/domtraversal/main.cpp main program
+
+    When the application's event loop is run, the Qt home page will load, and the
+    tree widget will be updated to show the document structure. Navigating to another
+    page will cause the tree widget to be updated to show the document structure of
+    the new page.
+
+    \section1 Further Reading
+
+    The QWebElement documentation contains more information about DOM access for the
+    QtWebKit classes.
+
+    In this example, we take advantage of Qt's
+    \l{Using a Designer UI File in Your Application#Automatic Connections}{auto-connection}
+    feature to avoid explicitly connecting signals to slots. The user interface
+    contains a QWebView widget called \c webView whose \l{QWebView::}{loadFinished()}
+    signal is automatically connected to the \c on_webView_loadFinished() slot when
+    we call \l{QWidget::}{setupUi()} in the \c Window constructor.
+*/
diff --git a/examples/webkitwidgets/domtraversal/domtraversal.pro b/examples/webkitwidgets/domtraversal/domtraversal.pro
new file mode 100644
index 0000000..8c53258
--- /dev/null
+++ b/examples/webkitwidgets/domtraversal/domtraversal.pro
@@ -0,0 +1,9 @@
+QT       += webkitwidgets network widgets
+FORMS     = window.ui
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/domtraversal
+INSTALLS += target
diff --git a/examples/webkit/domtraversal/main.cpp b/examples/webkitwidgets/domtraversal/main.cpp
index 014086a..6556397 100644
--- a/examples/webkit/domtraversal/main.cpp
+++ b/examples/webkitwidgets/domtraversal/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -37,7 +37,7 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
+//! [main program]
 #include <QApplication>
 #include "window.h"
 
@@ -49,3 +49,4 @@ int main(int argc, char *argv[])
     window.setUrl(QUrl("http://qt-project.org/"));
     return app.exec();
 }
+//! [main program]
diff --git a/examples/webkit/domtraversal/window.cpp b/examples/webkitwidgets/domtraversal/window.cpp
index f96b9be..7e94a48 100644
--- a/examples/webkit/domtraversal/window.cpp
+++ b/examples/webkitwidgets/domtraversal/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/domtraversal/window.h b/examples/webkitwidgets/domtraversal/window.h
index f9ce2f7..38e1058 100644
--- a/examples/webkit/domtraversal/window.h
+++ b/examples/webkitwidgets/domtraversal/window.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/domtraversal/window.ui b/examples/webkitwidgets/domtraversal/window.ui
index e245aa6..e245aa6 100644
--- a/examples/webkit/domtraversal/window.ui
+++ b/examples/webkitwidgets/domtraversal/window.ui
diff --git a/examples/embedded/anomaly/README.TXT b/examples/webkitwidgets/embedded/anomaly/README.TXT
index e69de29..e69de29 100644
--- a/examples/embedded/anomaly/README.TXT
+++ b/examples/webkitwidgets/embedded/anomaly/README.TXT
diff --git a/examples/embedded/anomaly/anomaly.pro b/examples/webkitwidgets/embedded/anomaly/anomaly.pro
index 00253f7..ddb20f2 100644
--- a/examples/embedded/anomaly/anomaly.pro
+++ b/examples/webkitwidgets/embedded/anomaly/anomaly.pro
@@ -24,7 +24,5 @@ SOURCES += src/Main.cpp \
     src/webview.cpp
 RESOURCES += src/anomaly.qrc
 
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/embedded/anomaly
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro src/images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/embedded/anomaly
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/embedded/anomaly
+INSTALLS += target
diff --git a/examples/embedded/anomaly/src/AddressBar.cpp b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.cpp
index dfb4043..ff4fc17 100644
--- a/examples/embedded/anomaly/src/AddressBar.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/AddressBar.h b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.h
index ae9010d..675f172 100644
--- a/examples/embedded/anomaly/src/AddressBar.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/AddressBar.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/BookmarksView.cpp b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp
index 63e48e2..8b3c13e 100644
--- a/examples/embedded/anomaly/src/BookmarksView.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/BookmarksView.h b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.h
index 4d68a6c..5c1c0f8 100644
--- a/examples/embedded/anomaly/src/BookmarksView.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/BookmarksView.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/BrowserView.cpp b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.cpp
index 46f898d..e510ef3 100644
--- a/examples/embedded/anomaly/src/BrowserView.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/BrowserView.h b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.h
index 51f5897..c6a9c1b 100644
--- a/examples/embedded/anomaly/src/BrowserView.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserView.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/BrowserWindow.cpp b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.cpp
index c380766..c3ed769 100644
--- a/examples/embedded/anomaly/src/BrowserWindow.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/BrowserWindow.h b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.h
index eb97f77..2a5473e 100644
--- a/examples/embedded/anomaly/src/BrowserWindow.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/BrowserWindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/ControlStrip.cpp b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.cpp
index c5f2aee..691b195 100644
--- a/examples/embedded/anomaly/src/ControlStrip.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/ControlStrip.h b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.h
index 8c37036..b727ffc 100644
--- a/examples/embedded/anomaly/src/ControlStrip.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/ControlStrip.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/HomeView.cpp b/examples/webkitwidgets/embedded/anomaly/src/HomeView.cpp
index 9bc0fee..c32154a 100644
--- a/examples/embedded/anomaly/src/HomeView.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/HomeView.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/HomeView.h b/examples/webkitwidgets/embedded/anomaly/src/HomeView.h
index bac25ae..dc7709d 100644
--- a/examples/embedded/anomaly/src/HomeView.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/HomeView.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/Main.cpp b/examples/webkitwidgets/embedded/anomaly/src/Main.cpp
index 958738d..82b5690 100644
--- a/examples/embedded/anomaly/src/Main.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/Main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/TitleBar.cpp b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.cpp
index c6a67e8..4884db7 100644
--- a/examples/embedded/anomaly/src/TitleBar.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/TitleBar.h b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.h
index 9747f97..71e4c7f 100644
--- a/examples/embedded/anomaly/src/TitleBar.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/TitleBar.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/ZoomStrip.cpp b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.cpp
index 5b0b15e..ab4c6b4 100644
--- a/examples/embedded/anomaly/src/ZoomStrip.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/ZoomStrip.h b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.h
index a30b6a3..0ff58fe 100644
--- a/examples/embedded/anomaly/src/ZoomStrip.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/ZoomStrip.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/anomaly.qrc b/examples/webkitwidgets/embedded/anomaly/src/anomaly.qrc
index d8ea630..d8ea630 100644
--- a/examples/embedded/anomaly/src/anomaly.qrc
+++ b/examples/webkitwidgets/embedded/anomaly/src/anomaly.qrc
diff --git a/examples/embedded/anomaly/src/flickcharm.cpp b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.cpp
index 4e30ee8..faa46d7 100644
--- a/examples/embedded/anomaly/src/flickcharm.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/flickcharm.h b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.h
index 8042ecd..9327de5 100644
--- a/examples/embedded/anomaly/src/flickcharm.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/flickcharm.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/images/button-close.png b/examples/webkitwidgets/embedded/anomaly/src/images/button-close.png
index 7a7b048..7a7b048 100644
--- a/examples/embedded/anomaly/src/images/button-close.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/button-close.png
diff --git a/examples/embedded/anomaly/src/images/edit-find.png b/examples/webkitwidgets/embedded/anomaly/src/images/edit-find.png
index b84b1e2..b84b1e2 100644
--- a/examples/embedded/anomaly/src/images/edit-find.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/edit-find.png
diff --git a/examples/embedded/anomaly/src/images/go-next.png b/examples/webkitwidgets/embedded/anomaly/src/images/go-next.png
index ed89a36..ed89a36 100644
--- a/examples/embedded/anomaly/src/images/go-next.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/go-next.png
diff --git a/examples/embedded/anomaly/src/images/go-previous.png b/examples/webkitwidgets/embedded/anomaly/src/images/go-previous.png
index 44e803d..44e803d 100644
--- a/examples/embedded/anomaly/src/images/go-previous.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/go-previous.png
diff --git a/examples/embedded/anomaly/src/images/list-add.png b/examples/webkitwidgets/embedded/anomaly/src/images/list-add.png
index 2acdd8f..2acdd8f 100644
--- a/examples/embedded/anomaly/src/images/list-add.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/list-add.png
diff --git a/examples/embedded/anomaly/src/images/list-remove.png b/examples/webkitwidgets/embedded/anomaly/src/images/list-remove.png
index c5524f7..c5524f7 100644
--- a/examples/embedded/anomaly/src/images/list-remove.png
+++ b/examples/webkitwidgets/embedded/anomaly/src/images/list-remove.png
diff --git a/examples/embedded/anomaly/src/webview.cpp b/examples/webkitwidgets/embedded/anomaly/src/webview.cpp
index 03d9ced..eb0dc89 100644
--- a/examples/embedded/anomaly/src/webview.cpp
+++ b/examples/webkitwidgets/embedded/anomaly/src/webview.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/anomaly/src/webview.h b/examples/webkitwidgets/embedded/anomaly/src/webview.h
index d7d4193..00d3c30 100644
--- a/examples/embedded/anomaly/src/webview.h
+++ b/examples/webkitwidgets/embedded/anomaly/src/webview.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/embedded/embedded.pro b/examples/webkitwidgets/embedded/embedded.pro
index 9c61eec..9c61eec 100644
--- a/examples/embedded/embedded.pro
+++ b/examples/webkitwidgets/embedded/embedded.pro
diff --git a/examples/webkitwidgets/fancybrowser/doc/images/fancybrowser-example.png b/examples/webkitwidgets/fancybrowser/doc/images/fancybrowser-example.png
new file mode 100644
index 0000000..717ac9d
--- /dev/null
+++ b/examples/webkitwidgets/fancybrowser/doc/images/fancybrowser-example.png
diff --git a/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc b/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
new file mode 100644
index 0000000..937b00d
--- /dev/null
+++ b/examples/webkitwidgets/fancybrowser/doc/src/fancybrowser.qdoc
@@ -0,0 +1,140 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/fancybrowser
+    \title Fancy Browser Example
+    \brief Demonstrates how to use browse web and manipulate content
+    \ingroup webkit-widgetexamples
+
+    \brief The Fancy Browser example shows how to use JQuery with QtWebKit to
+    create a web browser with special effects and content
+    manipulation.
+
+    \image fancybrowser-example.png
+
+    The application makes use of QWebFrame::evaluateJavaScript to
+    evaluate the jQuery JavaScript code. A QMainWindow with a QWebView
+    as central widget builds up the browser itself.
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class inherits QMainWindow. It implements a number of
+    slots to perform actions on both the application and on the web content.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.h 1
+
+    We also declare a QString that contains the jQuery, a QWebView
+    that displays the web content, and a QLineEdit that acts as the
+    address bar.
+
+    \section1 MainWindow Class Implementation
+
+    We start by implementing the constructor.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 1
+
+    The first part of the constructor sets the value of \c progress to
+    0. This value will be used later in the code to visualize the
+    loading of a webpage.
+
+    Next, the jQuery library is loaded using a QFile and reading the file
+    content. The jQuery library is a JavaScript library that provides different
+    functions for manipulating HTML.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 2
+
+    The second part of the constructor creates a QWebView and connects
+    slots to the views signals. Furthermore, we create a QLineEdit as
+    the browsers address bar. We then set the horizontal QSizePolicy
+    to fill the available area in the browser at all times. We add the
+    QLineEdit to a QToolbar together with a set of navigation actions
+    from QWebView::pageAction.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 3
+
+    The third and last part of the constructor implements two QMenus and assigns
+    a set of actions to them. The last line sets the QWebView as the central
+    widget in the QMainWindow.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 4
+
+    When the page is loaded, \c adjustLocation() updates the address
+    bar; \c adjustLocation() is triggered by the \c loadFinished()
+    signal in QWebView. In \c changeLocation() we create a QUrl
+    object, and then use it to load the page into the QWebView. When
+    the new web page has finished loading, \c adjustLocation() will be
+    run once more to update the address bar.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 5
+
+    \c adjustTitle() sets the window title and displays the loading
+    progress. This slot is triggered by the \c titleChanged() signal
+    in QWebView.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 6
+
+    When a web page has loaded, \c finishLoading() is triggered by the
+    \c loadFinished() signal in QWebView. \c finishLoading() then updates the
+    progress in the title bar and calls \c evaluateJavaScript() to evaluate the
+    jQuery library. This evaluates the JavaScript against the current web page.
+    What that means is that the JavaScript can be viewed as part of the content
+    loaded into the QWebView, and therefore needs to be loaded every time a new
+    page is loaded. Once the jQuery library is loaded, we can start executing
+    the different jQuery functions in the browser.
+
+    The rotateImages() function is then called explicitely to make sure
+    that the images of the newly loaded page respect the state of the toggle
+    action.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 7
+
+    The first jQuery-based function, \c highlightAllLinks(), is designed to
+    highlight all links in the current webpage. The JavaScript code looks
+    for web elements named \e {a}, which is the tag for a hyperlink.
+    For each such element, the background color is set to be yellow by
+    using CSS.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 8
+
+    The \c rotateImages() function rotates the images on the current
+    web page. Webkit supports CSS transforms and this JavaScript code
+    looks up all \e {img} elements and rotates the images 180 degrees
+    and then back again.
+
+    \snippet webkitwidgets/fancybrowser/mainwindow.cpp 9
+
+    The remaining four methods remove different elements from the current web
+    page. \c removeGifImages() removes all GIF images on the page by looking up
+    the \e {src} attribute of all the elements on the web page. Any element with
+    a \e {gif} file as its source is removed. \c removeInlineFrames() removes all
+    \e {iframe} or inline elements. \c removeObjectElements() removes all
+    \e {object} elements, and \c removeEmbeddedElements() removes any elements
+    such as plugins embedded on the page using the \e {embed} tag.
+
+*/
+
diff --git a/examples/webkitwidgets/fancybrowser/fancybrowser.pro b/examples/webkitwidgets/fancybrowser/fancybrowser.pro
new file mode 100644
index 0000000..81938ec
--- /dev/null
+++ b/examples/webkitwidgets/fancybrowser/fancybrowser.pro
@@ -0,0 +1,9 @@
+QT      +=  webkitwidgets network widgets
+HEADERS =   mainwindow.h
+SOURCES =   main.cpp \
+            mainwindow.cpp
+RESOURCES = jquery.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/fancybrowser
+INSTALLS += target
diff --git a/examples/webkit/fancybrowser/jquery.min.js b/examples/webkitwidgets/fancybrowser/jquery.min.js
index b1ae21d..b1ae21d 100644
--- a/examples/webkit/fancybrowser/jquery.min.js
+++ b/examples/webkitwidgets/fancybrowser/jquery.min.js
diff --git a/examples/webkit/fancybrowser/jquery.qrc b/examples/webkitwidgets/fancybrowser/jquery.qrc
index 1022d68..1022d68 100644
--- a/examples/webkit/fancybrowser/jquery.qrc
+++ b/examples/webkitwidgets/fancybrowser/jquery.qrc
diff --git a/examples/webkit/fancybrowser/main.cpp b/examples/webkitwidgets/fancybrowser/main.cpp
index ceb0f9a..451f247 100644
--- a/examples/webkit/fancybrowser/main.cpp
+++ b/examples/webkitwidgets/fancybrowser/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -46,7 +46,7 @@ int main(int argc, char * argv[])
     QApplication app(argc, argv);
     QUrl url;
     if (argc > 1)
-        url = QUrl(argv[1]);
+        url = QUrl::fromUserInput(argv[1]);
     else
         url = QUrl("http://www.google.com/ncr");
     MainWindow *browser = new MainWindow(url);
diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
index e29f958..c53ce58 100644
--- a/examples/webkit/fancybrowser/mainwindow.cpp
+++ b/examples/webkitwidgets/fancybrowser/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -131,7 +131,7 @@ void MainWindow::adjustLocation()
 
 void MainWindow::changeLocation()
 {
-    QUrl url = QUrl(locationEdit->text());
+    QUrl url = QUrl::fromUserInput(locationEdit->text());
     view->load(url);
     view->setFocus();
 }
@@ -167,7 +167,10 @@ void MainWindow::finishLoading(bool)
 //! [7]
 void MainWindow::highlightAllLinks()
 {
-    QString code = "$('a').each( function () { $(this).css('background-color', 'yellow') } )";
+    // We append '; undefined' after the jQuery call here to prevent a possible recursion loop and crash caused by
+    // the way the elements returned by the each iterator elements reference each other, which causes problems upon
+    // converting them to QVariants.
+    QString code = "$('a').each( function () { $(this).css('background-color', 'yellow') } ); undefined";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 //! [7]
@@ -176,10 +179,14 @@ void MainWindow::highlightAllLinks()
 void MainWindow::rotateImages(bool invert)
 {
     QString code;
+
+    // We append '; undefined' after each of the jQuery calls here to prevent a possible recursion loop and crash caused by
+    // the way the elements returned by the each iterator elements reference each other, which causes problems upon
+    // converting them to QVariants.
     if (invert)
-        code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(180deg)') } )";
+        code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(180deg)') } ); undefined";
     else
-        code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(0deg)') } )";
+        code = "$('img').each( function () { $(this).css('-webkit-transition', '-webkit-transform 2s'); $(this).css('-webkit-transform', 'rotate(0deg)') } ); undefined";
     view->page()->mainFrame()->evaluateJavaScript(code);
 }
 //! [8]
diff --git a/examples/webkit/fancybrowser/mainwindow.h b/examples/webkitwidgets/fancybrowser/mainwindow.h
index fabb6a0..9d4bdf1 100644
--- a/examples/webkit/fancybrowser/mainwindow.h
+++ b/examples/webkitwidgets/fancybrowser/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/formextractor/doc/images/formextractor-example.png b/examples/webkitwidgets/formextractor/doc/images/formextractor-example.png
new file mode 100644
index 0000000..155cdaa
--- /dev/null
+++ b/examples/webkitwidgets/formextractor/doc/images/formextractor-example.png
diff --git a/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc b/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
new file mode 100644
index 0000000..cec3026
--- /dev/null
+++ b/examples/webkitwidgets/formextractor/doc/src/formextractor.qdoc
@@ -0,0 +1,39 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/formextractor
+    \title Form Extractor Example
+    \brief Demonstrates how to read form data using JavaScript
+    \ingroup webkit-widgetexamples
+
+    \brief The Form Extractor example shows how to use QWebFrame with JavaScript to
+    extract form data.
+
+    \image formextractor-example.png
+
+*/
diff --git a/examples/webkit/formextractor/form.html b/examples/webkitwidgets/formextractor/form.html
index 6b0bbde..6b0bbde 100755
--- a/examples/webkit/formextractor/form.html
+++ b/examples/webkitwidgets/formextractor/form.html
diff --git a/examples/webkit/formextractor/formextractor.cpp b/examples/webkitwidgets/formextractor/formextractor.cpp
index 28f6abf..f78c138 100644
--- a/examples/webkit/formextractor/formextractor.cpp
+++ b/examples/webkitwidgets/formextractor/formextractor.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/formextractor/formextractor.h b/examples/webkitwidgets/formextractor/formextractor.h
index ff62f8c..e7af5bd 100644
--- a/examples/webkit/formextractor/formextractor.h
+++ b/examples/webkitwidgets/formextractor/formextractor.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/formextractor/formextractor.pro b/examples/webkitwidgets/formextractor/formextractor.pro
index ce86aa8..050ac89 100644
--- a/examples/webkit/formextractor/formextractor.pro
+++ b/examples/webkitwidgets/formextractor/formextractor.pro
@@ -10,7 +10,5 @@ FORMS        += formextractor.ui
 RESOURCES    += formextractor.qrc
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/formextractor
-sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro form.html images
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/webkit/formextractor
-INSTALLS += target sources
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/formextractor
+INSTALLS += target
diff --git a/examples/webkit/formextractor/formextractor.qrc b/examples/webkitwidgets/formextractor/formextractor.qrc
index e35f4b2..e35f4b2 100644
--- a/examples/webkit/formextractor/formextractor.qrc
+++ b/examples/webkitwidgets/formextractor/formextractor.qrc
diff --git a/examples/webkit/formextractor/formextractor.ui b/examples/webkitwidgets/formextractor/formextractor.ui
index 5c4afec..5c4afec 100644
--- a/examples/webkit/formextractor/formextractor.ui
+++ b/examples/webkitwidgets/formextractor/formextractor.ui
diff --git a/examples/webkit/formextractor/main.cpp b/examples/webkitwidgets/formextractor/main.cpp
index 8dae190..8f288fd 100644
--- a/examples/webkit/formextractor/main.cpp
+++ b/examples/webkitwidgets/formextractor/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/formextractor/mainwindow.cpp b/examples/webkitwidgets/formextractor/mainwindow.cpp
index 9e52ce8..90beed3 100644
--- a/examples/webkit/formextractor/mainwindow.cpp
+++ b/examples/webkitwidgets/formextractor/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/formextractor/mainwindow.h b/examples/webkitwidgets/formextractor/mainwindow.h
index cd4e8a6..6e1d529 100644
--- a/examples/webkit/formextractor/mainwindow.h
+++ b/examples/webkitwidgets/formextractor/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/framecapture/doc/images/framecapture-example.png b/examples/webkitwidgets/framecapture/doc/images/framecapture-example.png
new file mode 100644
index 0000000..edccf6b
--- /dev/null
+++ b/examples/webkitwidgets/framecapture/doc/images/framecapture-example.png
diff --git a/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc b/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc
new file mode 100644
index 0000000..d2e4e8f
--- /dev/null
+++ b/examples/webkitwidgets/framecapture/doc/src/webkit-framecapture.qdoc
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/framecapture
+    \title WebKit Frame Capture Example
+    \brief Demonstrates how to capture frame in the web page
+    \ingroup webkit-widgetexamples
+
+    The Frame Capture example shows how to use the WebKit browser engine to
+    obtain images of frames in a Web page.
+
+    This example is designed to be run from the command-line. Run the
+    example with a URL and the output file name as arguments. The application
+    captures the frame contents in a PNG image with the file name your
+    specified.
+
+    The following output image is generated by the application, if you pass the
+    URL, www.qt-project.org.
+
+    \image framecapture-example.png
+*/
diff --git a/examples/webkit/framecapture/framecapture.cpp b/examples/webkitwidgets/framecapture/framecapture.cpp
index 0b3441c..c99abd8 100644
--- a/examples/webkit/framecapture/framecapture.cpp
+++ b/examples/webkitwidgets/framecapture/framecapture.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/framecapture/framecapture.h b/examples/webkitwidgets/framecapture/framecapture.h
index 6f49ffb..95146b7 100644
--- a/examples/webkit/framecapture/framecapture.h
+++ b/examples/webkitwidgets/framecapture/framecapture.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/framecapture/framecapture.pro b/examples/webkitwidgets/framecapture/framecapture.pro
new file mode 100644
index 0000000..bdd1b4e
--- /dev/null
+++ b/examples/webkitwidgets/framecapture/framecapture.pro
@@ -0,0 +1,9 @@
+QT      += webkitwidgets network widgets
+
+HEADERS = framecapture.h
+SOURCES = main.cpp \
+          framecapture.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/framecapture
+INSTALLS += target
diff --git a/examples/webkit/framecapture/main.cpp b/examples/webkitwidgets/framecapture/main.cpp
index e900313..1ca8ee2 100644
--- a/examples/webkit/framecapture/main.cpp
+++ b/examples/webkitwidgets/framecapture/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/imageanalyzer/README b/examples/webkitwidgets/imageanalyzer/README
index 9415b57..9415b57 100644
--- a/examples/webkit/imageanalyzer/README
+++ b/examples/webkitwidgets/imageanalyzer/README
diff --git a/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-complete.png b/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-complete.png
new file mode 100644
index 0000000..83bfb26
--- /dev/null
+++ b/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-complete.png
diff --git a/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-progress.png b/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-progress.png
new file mode 100644
index 0000000..530effb
--- /dev/null
+++ b/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-progress.png
diff --git a/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-screenshot.png b/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-screenshot.png
new file mode 100644
index 0000000..cb0c42c
--- /dev/null
+++ b/examples/webkitwidgets/imageanalyzer/doc/images/webkit-imageanalyzer-screenshot.png
diff --git a/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc b/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc
new file mode 100644
index 0000000..35ca3bd
--- /dev/null
+++ b/examples/webkitwidgets/imageanalyzer/doc/src/webkit-bridge-imageanalyzer.qdoc
@@ -0,0 +1,162 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/imageanalyzer
+    \title The Webkit Bridge Tutorial - Hybrid Client Application
+    \brief Demonstrates how to integrate web functionality with other core
+           functionality.
+    \ingroup webkit-widgetexamples
+
+    In this example, we will show how to write a hybrid application using
+\l{The QtWebKit Bridge}{QtWebKit Bridge}, which distinguishes itself from a
+thin client in that it performs heavy calculations on the client side in C++,
+like a native application, but presents nothing more than a \c QWebView for its
+user interface, displaying web content written in HTML/JavaScript. The
+application uses QtConcurrent to distribute its work across as many CPU cores as
+are available from the system, so it can process each image in parallel.
+
+For the full reference documentation of QtWebKit hybrid development, see
+\l{qtwebkit-bridge.html}{The QtWebKit Bridge}.
+
+Initially, you will see a user interface with an empty list of images. Clicking
+on some of the images in the lower pane below adds them to the list view above,
+as shown in the screenshot below.
+
+    \image webkit-imageanalyzer-screenshot.png
+
+Now, we can click on \b Analyze, and each image is analyzed using some
+computationally intensive C++ function, in parallel and on different cores.
+Progress is shown while the analysis is proceeding.
+
+    \image webkit-imageanalyzer-progress.png
+
+and in the end, we will see something like this, where the average RGB values of
+each image are shown.
+
+    \image webkit-imageanalyzer-complete.png
+
+The MainWindow is defined in C++, and creates a \l QNetworkDiskCache and a
+\l QWebView, and tells the \l QWebView to load the starting page, providing us
+with a user interface for the client.
+
+  \snippet webkitwidgets/imageanalyzer/mainwindow.cpp MainWindow - constructor
+
+In this example, the sample content is addressed with the \tt qrc:/index.html
+URL. \tt qrc:/ indicates that the file is stored as a Qt resource (attached to
+the executable). In a real-world application, the content and images would
+likely be retrieved from the network rather than from resources.
+
+We wish to initialize an object reference in the JavaScript web page to point
+to our \tt ImageAnalyzer before any other scripts are run. To do this, we
+connect the \l{QWebFrame::}{javaScriptWindowObjectCleared()} signal to a slot
+which does the object creation and handoff to JavaScript.
+
+  \snippet webkitwidgets/imageanalyzer/mainwindow.cpp MainWindow - addJSObject
+
+The ImageAnalyzer object is created and added to a JavaScript object on the web
+page's mainFrame with \c addToJavaScriptWindowObject().
+
+    The start page is resources/index.html.
+    In one of its <div> regions, we have images, each
+    with an \c onClick() handler that calls \c addImage().
+
+    \snippet webkitwidgets/imageanalyzer/resources/index.html sample images
+
+Clicking an image adds it to an images list.
+
+    \snippet webkitwidgets/imageanalyzer/resources/index.html addImage
+
+The \b {Analyze} button at the bottom of the image list is clicked when we
+want to start the analysis:
+
+    \snippet webkitwidgets/imageanalyzer/resources/index.html images list
+
+When the user clicks the \b {Analyze} button, \c analyzeImages() is called,
+another regular JavaScript method, shown below.
+Notice it assumes the \c imageAnalyzer object is already defined and initialized
+in JavaScript space, but we guaranteed that by connecting our setup slot to the
+appropriate signal, \l{QWebFrame::}{javaScriptWindowObjectCleared()}.
+
+    \snippet webkitwidgets/imageanalyzer/resources/index.html analyzeImages
+
+The only methods on \c ImageAnalyzer that we can or do call from JavaScript are
+those which are exposed through \{The Meta-Object System}{Qt's MetaObject}
+system: \l{The Property System}{property} getter/setter methods,
+\c public \l {Signals & Slots}{signals and slots}, and other
+\l{Q_INVOKABLE}{Q_INVOKABLE} functions.
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.h ImageAnalyzer - public interface
+\dots
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.h ImageAnalyzer - private members
+
+Most of the members are set up in the constructor:
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - Constructor
+
+Back on the JavaScript side, we want to connect signals from this object to
+JavaScript functions on our web page, after the web page is loaded, but before
+the images are analyzed.
+
+From \c connectSlots(), we can see how to connect signals from the imageAnalyzer
+object to regular JavaScript functions, which can also behave like slots. We use
+this to monitor and display progress from the C++ side.
+
+    \snippet webkitwidgets/imageanalyzer/resources/index.html connect slots
+
+The only public slot is \c startAnalysis(), called to place
+a list of URLs into the image analyzer's QtConcurrent processing queue
+from JavaScript space.
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - startAnalysis
+
+The images need to be loaded again now, which is why fetchURLs first checks the
+cache to see if we can save an extra network get.
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - fetchURLs
+
+For the images that were not in the cache, \c handleReply()
+will load them into a QImage when the data is ready.
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - handleReply
+
+After the images are loaded, they are queued up in preparation to be
+sent in a batch for analysis to a \l QFutureWatcher, which will distribute the
+processing across multiple threads and cores, depending on how many are available.
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - queueImage
+
+The function that gets performed on each image is \c averageRGB(),
+as specified in argument 2 to the \l{QtConcurrent::mapped()} function.
+Notice it repeats the same calculations 100 times on each pixel to keep the CPU
+very busy. This is done only for the purposes of the demo so that the analysis
+takes a noticeable time to complete.
+
+\snippet webkitwidgets/imageanalyzer/imageanalyzer.cpp ImageAnalyzer - averageRGB
+
+*/
+
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.cpp b/examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp
index 973411c..97fff64 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.cpp
+++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.h b/examples/webkitwidgets/imageanalyzer/imageanalyzer.h
index 1b0948c..f74aea5 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.h
+++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.pro b/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro
index 3efc656..442a05f 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.pro
+++ b/examples/webkitwidgets/imageanalyzer/imageanalyzer.pro
@@ -9,6 +9,6 @@ QT += network webkitwidgets widgets concurrent
 
 RESOURCES = resources/imageanalyzer.qrc
 
-OTHER_FILES += html/index.html README ../webkit-bridge-tutorial.qdoc outline.txt
+EXAMPLE_FILES += html/index.html ../webkit-bridge-tutorial.qdoc outline.txt
 
 
diff --git a/examples/webkit/imageanalyzer/main.cpp b/examples/webkitwidgets/imageanalyzer/main.cpp
index 3601264..a6df076 100644
--- a/examples/webkit/imageanalyzer/main.cpp
+++ b/examples/webkitwidgets/imageanalyzer/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/imageanalyzer/mainwindow.cpp b/examples/webkitwidgets/imageanalyzer/mainwindow.cpp
index 71193e7..d69b509 100644
--- a/examples/webkit/imageanalyzer/mainwindow.cpp
+++ b/examples/webkitwidgets/imageanalyzer/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/imageanalyzer/mainwindow.h b/examples/webkitwidgets/imageanalyzer/mainwindow.h
index 6fcd74a..0bef5e4 100644
--- a/examples/webkit/imageanalyzer/mainwindow.h
+++ b/examples/webkitwidgets/imageanalyzer/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/imageanalyzer/resources/imageanalyzer.qrc b/examples/webkitwidgets/imageanalyzer/resources/imageanalyzer.qrc
index fe9a5df..fe9a5df 100644
--- a/examples/webkit/imageanalyzer/resources/imageanalyzer.qrc
+++ b/examples/webkitwidgets/imageanalyzer/resources/imageanalyzer.qrc
diff --git a/examples/webkit/imageanalyzer/resources/images/README b/examples/webkitwidgets/imageanalyzer/resources/images/README
index 176a1da..176a1da 100644
--- a/examples/webkit/imageanalyzer/resources/images/README
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/README
diff --git a/examples/webkit/imageanalyzer/resources/images/bellaCoola.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/bellaCoola.jpg
index f90ed54..f90ed54 100644
--- a/examples/webkit/imageanalyzer/resources/images/bellaCoola.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/bellaCoola.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/flower.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/flower.jpg
index 6b7f6be..6b7f6be 100644
--- a/examples/webkit/imageanalyzer/resources/images/flower.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/flower.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/mtRainier.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/mtRainier.jpg
index d09a3f2..d09a3f2 100644
--- a/examples/webkit/imageanalyzer/resources/images/mtRainier.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/mtRainier.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/seaShell.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/seaShell.jpg
index c5005a9..c5005a9 100644
--- a/examples/webkit/imageanalyzer/resources/images/seaShell.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/seaShell.jpg
diff --git a/examples/webkit/imageanalyzer/resources/images/trees.jpg b/examples/webkitwidgets/imageanalyzer/resources/images/trees.jpg
index 083b26d..083b26d 100644
--- a/examples/webkit/imageanalyzer/resources/images/trees.jpg
+++ b/examples/webkitwidgets/imageanalyzer/resources/images/trees.jpg
diff --git a/examples/webkit/imageanalyzer/resources/index.html b/examples/webkitwidgets/imageanalyzer/resources/index.html
index 6532951..6532951 100644
--- a/examples/webkit/imageanalyzer/resources/index.html
+++ b/examples/webkitwidgets/imageanalyzer/resources/index.html
diff --git a/examples/webkitwidgets/previewer/doc/images/previewer-example.png b/examples/webkitwidgets/previewer/doc/images/previewer-example.png
new file mode 100644
index 0000000..d930250
--- /dev/null
+++ b/examples/webkitwidgets/previewer/doc/images/previewer-example.png
diff --git a/examples/webkitwidgets/previewer/doc/images/previewer-ui.png b/examples/webkitwidgets/previewer/doc/images/previewer-ui.png
new file mode 100644
index 0000000..c92d136
--- /dev/null
+++ b/examples/webkitwidgets/previewer/doc/images/previewer-ui.png
diff --git a/examples/webkitwidgets/previewer/doc/src/previewer.qdoc b/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
new file mode 100644
index 0000000..4c8a36d
--- /dev/null
+++ b/examples/webkitwidgets/previewer/doc/src/previewer.qdoc
@@ -0,0 +1,169 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/previewer
+    \title Previewer Example
+    \brief Demonstrates how to preview HTML data
+    \ingroup webkit-widgetexamples
+
+    \brief The Previewer example shows how to use QtWebKit's QWebView to preview
+    HTML data written in a QPlainTextEdit.
+
+    \image previewer-example.png
+
+    \section1 The User Interface
+
+    Before we begin, we create a user interface using Qt Designer. Two QGroupBox
+    objects - the editor group box and the previewer group box are separated
+    by a QSplitter. In the editor group box, we have a QPlainTextEdit object,
+    \c plainTextEdit, and two QPushButton objects. In the previewer group box,
+    we have a QWebView object, \c webView.
+
+    \image previewer-ui.png
+
+    \section1 Previewer Class Definition
+
+    The \c Previewer class is a subclass of both QWidget and Ui::Form.
+    We subclass Ui::Form in order to embed the Qt Designer user interface form
+    created earlier. This method of embedding forms is known as the
+    \l{The Multiple Inheritance Approach}{multiple inheritance approach}.
+
+    In our \c previewer.h file, we have a constructor and a slot,
+    \c on_previewButton_clicked().
+
+    \snippet webkitwidgets/previewer/previewer.h 0
+
+    \section1 Previewer Class Implementation
+
+    The \c{Previewer}'s constructor is only responsible for setting up the
+    user interface.
+
+    \snippet webkitwidgets/previewer/previewer.cpp 0
+
+    The \c on_previewButton_clicked() is a slot corresponding to the
+    \c{previewButton}'s \l{QPushButton::}{clicked()} signal. When the
+    \c previewButton is clicked, we extract the contents of \c plainTextEdit,
+    and then invoke the \l{QWebView::}{setHtml()} function to display our
+    contents as HTML.
+
+    \snippet webkitwidgets/previewer/previewer.cpp 1
+
+    \section1 MainWindow Class Definition
+
+    The \c MainWindow class for the Previewer example is a subclass of
+    QMainWindow with a constructor and five private slots: \c open(),
+    \c openUrl(), \c save(), \c about() and \c updateTextEdit().
+
+    \snippet webkitwidgets/previewer/mainwindow.h 0
+
+    The private objects in \c MainWindow are \c centralWidget, which is
+    a \c Previewer object, \c fileMenu, \c helpMenu and the QAction objects
+    \c openAct, \c openUrlAct, \c saveAct, \c exitAct, \c aboutAct and
+    \c aboutQtAct.
+
+    \snippet webkitwidgets/previewer/mainwindow.h 1
+
+    There are three private functions: \c createActions(), \c createMenus()
+    and \c setStartupText(). The \c createActions() and \c createMenus()
+    functions are necessary to set up the main window's actions and
+    assign them to the \gui File and \gui Help menus. The \c setStartupText()
+    function, on the other hand, displays a description about the example
+    in its HTML Previewer window.
+
+    \section1 MainWindow Class Implementation
+
+    The \c{MainWindow}'s constructor invokes \c createActions() and
+    \c createMenus() to set up the \gui File menu and \gui Help menu. Then,
+    the \c Previewer object, \c centralWidget, is set to the main window's
+    central widget. Also, we connect \c webView's
+    \l{QWebView::}{loadFinished()} signal to our \c updateTextEdit() slot.
+    Finally, we call the \c setStartupText() function to display the
+    description of the example.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 0
+
+    Within the \c createActions() function, we instantiate all our private
+    QAction objects which we declared in \c{mainwindow.h}. We set the
+    short cut and status tip for these actions and connect their
+    \l{QAction::}{triggered()} signal to appropriate slots.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 1
+    \dots
+
+    The \c createMenus() function instantiates the QMenu items, \c fileMenu
+    and \c helpMenu and adds them to the main window's
+    \l{QMainWindow::menuBar()}{menu bar}.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 2
+
+    The example also provides an \c about() slot to describe its purpose.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 3
+
+    The \c MainWindow class provides two types of \gui Open functions:
+    \c open() and \c openUrl(). The \c open() function opens an HTML file
+    with \c fileName, and reads it with QTextStream. The function then
+    displays the output on \c plainTextEdit. The file's name is obtained
+    using QFileDialog's \l{QFileDialog::}{getOpenFileName()} function.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 4
+
+    The \c openUrl() function, on the other hand, displays a QInputDialog
+    to obtain a URL, and displays it on \c webView.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 5
+
+    In order to save a HTML file, the \c save() function first extracts the
+    contents of \c plainTextEdit and displays a QFileDialog to obtain
+    \c fileName. Then, we use a QTextStream object, \c in, to write to
+    \c file.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 6
+
+    Earlier, in \c{MainWindow}'s constructor, we connected \c{webView}'s
+    \l{QWebView::}{loadFinished()} signal to our private \c updateTextEdit()
+    slot. This slot updates the contents of \c plainTextEdit with the HTML
+    source of the web page's main frame, obtained using \l{QWebFrame}'s
+    \l{QWebFrame::}{toHtml()} function.
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 7
+
+    To provide a description about the Previewer example, when it starts up,
+    we use the \c setStartupText() function, as shown below:
+
+    \snippet webkitwidgets/previewer/mainwindow.cpp 8
+
+
+    \section1 The \c{main()} Function
+
+    The \c main() function instantiates a \c MainWindow object, \c mainWindow,
+    and displays it with the \l{QWidget::}{show()} function.
+
+    \snippet webkitwidgets/previewer/main.cpp 0
+
+*/
diff --git a/examples/webkit/previewer/main.cpp b/examples/webkitwidgets/previewer/main.cpp
index f08fa58..5a89340 100644
--- a/examples/webkit/previewer/main.cpp
+++ b/examples/webkitwidgets/previewer/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/previewer/mainwindow.cpp b/examples/webkitwidgets/previewer/mainwindow.cpp
index e0dc069..8314f60 100644
--- a/examples/webkit/previewer/mainwindow.cpp
+++ b/examples/webkitwidgets/previewer/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/previewer/mainwindow.h b/examples/webkitwidgets/previewer/mainwindow.h
index 9fd9deb..f3a5790 100644
--- a/examples/webkit/previewer/mainwindow.h
+++ b/examples/webkitwidgets/previewer/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/previewer/previewer.cpp b/examples/webkitwidgets/previewer/previewer.cpp
index dfd6dd4..054b594 100644
--- a/examples/webkit/previewer/previewer.cpp
+++ b/examples/webkitwidgets/previewer/previewer.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/previewer/previewer.h b/examples/webkitwidgets/previewer/previewer.h
index 5692e3b..68ba278 100644
--- a/examples/webkit/previewer/previewer.h
+++ b/examples/webkitwidgets/previewer/previewer.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/previewer/previewer.pro b/examples/webkitwidgets/previewer/previewer.pro
new file mode 100644
index 0000000..8bca084
--- /dev/null
+++ b/examples/webkitwidgets/previewer/previewer.pro
@@ -0,0 +1,11 @@
+QT      +=  webkitwidgets network widgets
+HEADERS =   previewer.h \
+            mainwindow.h
+SOURCES =   main.cpp \
+            previewer.cpp \
+            mainwindow.cpp
+FORMS   =   previewer.ui
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/previewer
+INSTALLS += target
diff --git a/examples/webkit/previewer/previewer.ui b/examples/webkitwidgets/previewer/previewer.ui
index d4c9992..d4c9992 100644
--- a/examples/webkit/previewer/previewer.ui
+++ b/examples/webkitwidgets/previewer/previewer.ui
diff --git a/examples/scroller/plot/main.cpp b/examples/webkitwidgets/scroller/plot/main.cpp
index f6806a8..a287bf8 100644
--- a/examples/scroller/plot/main.cpp
+++ b/examples/webkitwidgets/scroller/plot/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/scroller/plot/plot.pro b/examples/webkitwidgets/scroller/plot/plot.pro
new file mode 100644
index 0000000..d89c50b
--- /dev/null
+++ b/examples/webkitwidgets/scroller/plot/plot.pro
@@ -0,0 +1,11 @@
+HEADERS       = settingswidget.h \
+                plotwidget.h
+SOURCES       = settingswidget.cpp \
+                plotwidget.cpp \
+                main.cpp
+
+QT += webkitwidgets widgets
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/scroller/plot
+INSTALLS += target
diff --git a/examples/scroller/plot/plotwidget.cpp b/examples/webkitwidgets/scroller/plot/plotwidget.cpp
index 12d3e8c..3bc84d9 100644
--- a/examples/scroller/plot/plotwidget.cpp
+++ b/examples/webkitwidgets/scroller/plot/plotwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/scroller/plot/plotwidget.h b/examples/webkitwidgets/scroller/plot/plotwidget.h
index 2260195..8785d05 100644
--- a/examples/scroller/plot/plotwidget.h
+++ b/examples/webkitwidgets/scroller/plot/plotwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/scroller/plot/settingswidget.cpp b/examples/webkitwidgets/scroller/plot/settingswidget.cpp
index dd7efca..612d5f1 100644
--- a/examples/scroller/plot/settingswidget.cpp
+++ b/examples/webkitwidgets/scroller/plot/settingswidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/scroller/plot/settingswidget.h b/examples/webkitwidgets/scroller/plot/settingswidget.h
index e31ea97..770cd36 100644
--- a/examples/scroller/plot/settingswidget.h
+++ b/examples/webkitwidgets/scroller/plot/settingswidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/scroller/scroller.pro b/examples/webkitwidgets/scroller/scroller.pro
index 2b9ea53..2b9ea53 100644
--- a/examples/scroller/scroller.pro
+++ b/examples/webkitwidgets/scroller/scroller.pro
diff --git a/examples/webkitwidgets/scroller/wheel/doc/images/wheel-example.png b/examples/webkitwidgets/scroller/wheel/doc/images/wheel-example.png
new file mode 100644
index 0000000..878e101
--- /dev/null
+++ b/examples/webkitwidgets/scroller/wheel/doc/images/wheel-example.png
diff --git a/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc b/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc
new file mode 100644
index 0000000..5c58c0e
--- /dev/null
+++ b/examples/webkitwidgets/scroller/wheel/doc/src/wheel.qdoc
@@ -0,0 +1,113 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/scroller/wheel
+    \title Wheel Scroller Example
+    \brief Demonstrates how scrolling is handled in Qt.
+    \ingroup webkit-widgetexamples
+
+    The Wheel Scroller Example shows how to use QScroller, QScrollEvent
+    and QScrollPrepareEvent to implement smooth scrolling for a
+    custom Widget.
+
+    \image wheel-example.png
+
+    \section1 Basics
+
+    The QScroller class is the main part of the smooth scrolling
+    mechanism in Qt. It keeps track of the current scroll position and
+    speed and updates the object through events.
+    QScroller will get touch events via the QFlickGesture.
+    It will query the target object through a QScrollPrepareEvent for
+    the scroll area and other information.
+    QScroller will send QScrollEvents to inform the target object about
+    the current scroll position.
+    The target object (usually a QWidget or a QGraphicsObject) will
+    then need to update it's graphical representation to reflect the
+    new scroll position.
+
+    \section1 The Wheel Widget class
+
+    To demonstrate how to use the QScroller we implement a QWidget that
+    looks and works like the wheel of a slot machine.
+    The wheel can be started via touch events and will continue getting
+    slower.
+    Additionally the wheel should appear as if no border exists (which
+    would seem unnatural) and the scrolling should snap to center one
+    item.
+
+    In the widget we need to grab the QFlickGesture. The gesture itself
+    will setAcceptTouchEvents for us, so we don't need to do that here.
+
+    \snippet webkitwidgets/scroller/wheel/wheelwidget.cpp 0
+
+    The widget will get gesture events but in addition we also will
+    get the events from QScroller.
+    We will need to accept the QScrollPrepareEvent to indicate that
+    a scrolling should really be started from the given position.
+
+    \snippet webkitwidgets/scroller/wheel/wheelwidget.cpp 1
+
+    We should call all three set functions form QScrollPrepareEvent.
+
+    \list
+    \li \c setViewportSize to indicate our viewport size. Actually the
+     given code could be improved by giving our size minus the borders.
+    \li \c setMaxContentPos to indicate the maximum values for the scroll
+     position. The minimum values are implicitely set to 0.
+     In our example we give a very high number here and hope that the user
+     is not patient enough to scroll until the very end.
+    \li \c setContentPos to indicate the current scroll position.
+     We give a position in the middle of the huge scroll area.
+     Actually we give this position every time a new scroll is started so
+     the user will only reach the end if he continuously scrolls in one
+     direction which is not very likely.
+    \endlist
+
+    The handling of the QScrollEvent is a lengthly code not fully shown here.
+    \snippet webkitwidgets/scroller/wheel/wheelwidget.cpp 2
+
+    In principle it does three steps.
+    \list
+    \li It calculates and updates the current scroll position as given by
+     QScroller.
+    \li It repaints the widget so that the new position is shown.
+    \li It centers the item as soon as the scrolling stopps.
+    \endlist
+
+    The following code does the centering.
+    \snippet webkitwidgets/scroller/wheel/wheelwidget.cpp 3
+
+    We check if the scrolling is finished which is indicated in the
+    QScrollEvent by the \c isLast flag.
+    We then check if the item is not already centered and if not start a new
+    scroll by calling QScroller::scrollTo.
+
+    As you can see the QScroller can be used for other things besides simple
+    scroll areas.
+*/
diff --git a/examples/scroller/wheel/main.cpp b/examples/webkitwidgets/scroller/wheel/main.cpp
index 176eb7f..84ae3f8 100644
--- a/examples/scroller/wheel/main.cpp
+++ b/examples/webkitwidgets/scroller/wheel/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/scroller/wheel/wheel.pro b/examples/webkitwidgets/scroller/wheel/wheel.pro
new file mode 100644
index 0000000..4fb5e44
--- /dev/null
+++ b/examples/webkitwidgets/scroller/wheel/wheel.pro
@@ -0,0 +1,9 @@
+HEADERS       = wheelwidget.h
+SOURCES       = wheelwidget.cpp \
+                main.cpp
+
+QT += webkitwidgets widgets
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/scroller/wheel
+INSTALLS += target
diff --git a/examples/scroller/wheel/wheelwidget.cpp b/examples/webkitwidgets/scroller/wheel/wheelwidget.cpp
index 8864e82..04c427c 100644
--- a/examples/scroller/wheel/wheelwidget.cpp
+++ b/examples/webkitwidgets/scroller/wheel/wheelwidget.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
@@ -102,7 +102,7 @@ bool AbstractWheelWidget::event(QEvent *e)
         int ih = itemHeight();
 
 // ![2]
-
+// ![3]
         // -- calculate the current item position and offset and redraw the widget
         int ic = itemCount();
         if (ic>0) {
@@ -123,6 +123,7 @@ bool AbstractWheelWidget::event(QEvent *e)
 
         se->accept();
         return true;
+// ![3]
     }
     default:
         return QWidget::event(e);
diff --git a/examples/scroller/wheel/wheelwidget.h b/examples/webkitwidgets/scroller/wheel/wheelwidget.h
index 77f6c53..16e7de1 100644
--- a/examples/scroller/wheel/wheelwidget.h
+++ b/examples/webkitwidgets/scroller/wheel/wheelwidget.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/simpleselector/doc/images/webkit-simpleselector.png b/examples/webkitwidgets/simpleselector/doc/images/webkit-simpleselector.png
new file mode 100644
index 0000000..a0aa28a
--- /dev/null
+++ b/examples/webkitwidgets/simpleselector/doc/images/webkit-simpleselector.png
diff --git a/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc b/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc
new file mode 100644
index 0000000..84e40ad
--- /dev/null
+++ b/examples/webkitwidgets/simpleselector/doc/src/simpleselector.qdoc
@@ -0,0 +1,116 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webkitwidgets/simpleselector
+    \title Simple Selector Example
+    \brief Demonstrates how to identify HTML elements in a web page
+    \ingroup webkit-widgetexamples
+
+    The Simple Selector example shows how to use QWebElement to access the
+    Document Object Model (DOM) in a Web page.
+
+    \image webkit-simpleselector.png
+
+    The QWebElement class enables access to the document structure and content in a Web page,
+    as represented by a QWebFrame instance. It can be used for basic traversal of the document
+    structure (see the \l{DOM Traversal Example}), to search for particular elements, and to
+    modify any elements found.
+
+    This example uses a QWebView widget to display a Web page. A QLineEdit widget and QPushButton
+    allow the user to enter a query and highlight the results in the page. These widgets are
+    contained in an instance of the \c Window class, which we described below.
+
+    \section1 Window Class Definition
+
+    The \c Window class describes the example's user interface and this is partially described
+    by the \c window.ui file, created using \l{Qt Designer}:
+
+    \snippet webkitwidgets/simpleselector/window.h Window class definition
+
+    We use \l{Using a Designer UI File in Your Application#The Multiple Inheritance Approach}
+    {multiple inheritance} to include the user interface description. We define slots that
+    will automatically respond to signals emitted by certain user interface controls.
+
+    \section1 Window Class Implementation
+
+    Since the layout of the user interface is provided by the \c{window.ui} user interface file,
+    we only need to call the \l{QWidget::}{setupUi()} in the constructor:
+
+    \snippet webkitwidgets/simpleselector/window.cpp Window class constructor
+
+    This adds all the controls to the window and sets up connections between their signals
+    and suitably-named slots in the \c Window class. The QLineEdit instance was given a name of
+    \c elementLineEdit in Qt Designer, so the \c{on_elementLineEdit_returnPressed()} slot is
+    automatically connected to its \l{QLineEdit::}{returnPressed()} signal.
+
+    This slot performs the main work of this example. We begin by obtaining a QWebFrame
+    instance for the current page shown in the QWebView widget. Each QWebFrame contains
+    a QWebElement instance that represents the document, and we obtain this in order to
+    examine its contents:
+
+    \snippet webkitwidgets/simpleselector/window.cpp return pressed
+
+    Taking the contents of the QLineEdit as the query text, we call the element's
+    \l{QWebElement::}{findAll()} function to obtain a list of elements that match the
+    query.
+
+    For each element obtained, we modify its style by setting its \c style attribute
+    to give it a yellow background color.
+
+    Since we also want the query to be performed when the user clicks the \gui Highlight
+    button, we also implement the \c{on_highlightButton_clicked()} slot to simply call
+    the \c{on_elementLineEdit_returnPressed()} slot when it is invoked:
+
+    \snippet webkitwidgets/simpleselector/window.cpp button clicked
+
+    For completeness, we also implement a \c setUrl() function which simply passes on
+    a QUrl instance to the equivalent function in the QWebView widget:
+
+    \snippet webkitwidgets/simpleselector/window.cpp set URL
+
+    \section1 Starting the Example
+
+    The main function implementation is simple. We set up the application, create
+    a \c Window instance, set its URL, and show it:
+
+    \snippet webkitwidgets/simpleselector/main.cpp main program
+
+    When the application's event loop is run, the WebKit home page will load, and the
+    user can then begin to start running queries against the contents of the page.
+    The highlighting can only be removed by reloading the page. To do this, open a
+    context menu over the page and select the \gui Reload menu item.
+
+    \section1 Further Reading
+
+    The QWebElement documentation contains more information about DOM access for the
+    QtWebKit classes.
+
+    In this example, we take advantage of Qt's
+    \l{Using a Designer UI File in Your Application#Automatic Connections}{auto-connection}
+    feature to avoid explicitly connecting signals to slots.
+*/
diff --git a/examples/webkit/simpleselector/main.cpp b/examples/webkitwidgets/simpleselector/main.cpp
index a6da134..2895504 100644
--- a/examples/webkit/simpleselector/main.cpp
+++ b/examples/webkitwidgets/simpleselector/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/simpleselector/simpleselector.pro b/examples/webkitwidgets/simpleselector/simpleselector.pro
new file mode 100644
index 0000000..aa08390
--- /dev/null
+++ b/examples/webkitwidgets/simpleselector/simpleselector.pro
@@ -0,0 +1,9 @@
+QT       += webkitwidgets network widgets
+FORMS     = window.ui
+HEADERS   = window.h
+SOURCES   = main.cpp \
+            window.cpp
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/simpleselector
+INSTALLS += target
diff --git a/examples/webkit/simpleselector/window.cpp b/examples/webkitwidgets/simpleselector/window.cpp
index d3f60d3..c9487f1 100644
--- a/examples/webkit/simpleselector/window.cpp
+++ b/examples/webkitwidgets/simpleselector/window.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/simpleselector/window.h b/examples/webkitwidgets/simpleselector/window.h
index a1a1316..8f17acc 100644
--- a/examples/webkit/simpleselector/window.h
+++ b/examples/webkitwidgets/simpleselector/window.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkit/simpleselector/window.ui b/examples/webkitwidgets/simpleselector/window.ui
index aa824df..aa824df 100644
--- a/examples/webkit/simpleselector/window.ui
+++ b/examples/webkitwidgets/simpleselector/window.ui
diff --git a/examples/webkitwidgets/webkitwidgets.pro b/examples/webkitwidgets/webkitwidgets.pro
new file mode 100644
index 0000000..ab20df4
--- /dev/null
+++ b/examples/webkitwidgets/webkitwidgets.pro
@@ -0,0 +1,12 @@
+TEMPLATE =  subdirs
+SUBDIRS +=  domtraversal \
+            formextractor \
+            previewer \
+            fancybrowser \
+            simpleselector \
+            imageanalyzer \
+            framecapture \
+            browser \
+            embedded \
+            scroller \
+            xmlpatterns
diff --git a/examples/webkitwidgets/xmlpatterns/doc/images/qobjectxmlmodel-example.png b/examples/webkitwidgets/xmlpatterns/doc/images/qobjectxmlmodel-example.png
new file mode 100644
index 0000000..e40ba15
--- /dev/null
+++ b/examples/webkitwidgets/xmlpatterns/doc/images/qobjectxmlmodel-example.png
diff --git a/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc b/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc
new file mode 100644
index 0000000..6f5d08d
--- /dev/null
+++ b/examples/webkitwidgets/xmlpatterns/doc/src/qobjectxmlmodel.qdoc
@@ -0,0 +1,341 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file.  Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+  \example webkitwidgets/xmlpatterns
+  \title QObject XML Model Example
+  \brief Demonstrates how to present XML-like data structure in the web view
+  \ingroup webkit-widgetexamples
+
+  This example shows how to use QtXmlPatterns to query QObject trees
+  by modeling the non-XML data structure of a QObject tree to look
+  like XML.
+
+  \tableofcontents
+
+  \section1 Introduction
+
+  This example illustrates two important points about using XQuery to
+  query non-XML data modeled to look like XML. The first point is that
+  a custom node model class doesn't always have to actually build the
+  node model. Sometimes the node model can be an already existing data
+  structure, like the QObject tree used in this example. The second
+  point is to explain what is required to make non-XML data look like
+  XML.
+
+  In this example, we want to model a QObject tree to look like
+  XML. That is easy to do because a QObject tree maps to the XML tree
+  structure in a staightforward way. Each QObject node is modeled as
+  an XML element node. However, when we want to add the QMetaObject tree
+  to the QObject tree node model, we are trying to add a second tree to
+  the node model. The QMetaObject tree exists \e{behind} the QObject
+  tree. Adding the QMetaObject tree to the node model changes the two
+  dimensional tree into a three dimensional tree.
+
+  The query engine can only traverse two dimensional trees, because an
+  XML document is always a two dimensional tree. If we want to add the
+  QMetaObject tree to the node model, we have to somehow flatten it
+  into the same plane as the QObject tree. This requires that the
+  node model class must build an auxiliary data structure and make it
+  part of the two dimensional QObject node model. How to do this is
+  explained in \l{Including The QMetaObject Tree}.
+
+  \section2 The User Interface
+
+  The UI for this example was created using Qt Designer:
+
+  \image qobjectxmlmodel-example.png
+
+  \section1 Code Walk-Through
+
+  The strategy for this example is different from the strategy for the
+  \l{File System Example}{file system example}. In the file system
+  example, the node model class had to actually build a node model
+  because the non-XML data to be traversed was the computer's file
+  system, a structure stored on disk in a form that the query engine
+  couldn't use. The node model class had to build an analog of the
+  computer's file system in memory.
+
+  For this example, the data structure to be traversed already exists
+  in memory in a usable form. It is the QObject tree of the example
+  application itself. All we need is the pointer to the root of the
+  QObject tree.
+
+  \note When we add the QMetaObject tree to the node model, the node
+  model class will have to build an auxiliary data structure to move
+  the QMetaObject tree into the same plane as the QObject tree. This
+  is explained later in \l{Including The QMetaObject Tree}.
+
+  \section2 The Custom Node Model Class: QObjextXmlModel
+
+  The node model class for this example is QObjextXmlModel, which is
+  derived from QSimpleXmlNodeModel. QObjextXmlModel implements the
+  callback interface functions that don't have implementations in
+  QSimpleXmlNodeModel:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 0
+
+  The node model class declares three data members:
+
+  \target Three Data Members
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 2
+
+  The constructor sets \c m_baseURI to the QUrl constructed from the
+  \l{QCoreApplication::applicationFilePath()}{file path} of the
+  application executable.  This is the value returned by
+  \l{QAbstractXmlNodeModel::documentUri()}{documentUri()}. The
+  constructor sets \c{m_root} to point to the QObject tree for the
+  example application. This is the node model that the query engine
+  will use. And the constructor calls a local function to build the
+  auxiliary data structure (\c{m_allMetaObjects}) for including the
+  QMetaObject tree in the node model. How this auxiliary data
+  structure is incorporated into the QObject node model is discussed
+  in \l{Including The QMetaObject Tree}.
+
+  \section3 Accessing The Node Model
+
+  Since the query engine knows nothing about QObject trees, it can
+  only access them by calling functions in the node model callback
+  interface. The query engine passes a QXmlNodeModelIndex to uniquely
+  identify a node in the node model. The QXmlNodeModelIndex is
+  constructed from a pointer to the QObject that represents the node.
+  \l{QAbstractXmlNodeModel::createIndex()}{createIndex()} creates the
+  QXmlNodeModelIndex, as in the local \c{root()} function, for example:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 0
+
+  A QObject represents an element node in the node model, but we also
+  need to represent attribute nodes. For example, the class name of a
+  QObject is an attribute of the QObject, so it should be an attribute
+  node in the node model. A QObject's class name is obtained from the
+  QObject. (Actually, it is in the QMetaObject, which is obtained from
+  the QObject). This means that a single QObject logically represents
+  multiple nodes in the node model: the element node and potentially
+  many attribute nodes.
+
+  To uniquely identify an attribute node, we need the pointer to the
+  QObject containing the attribute, and an additional value that
+  identifies the attribute in the QObject. For this \e{additional
+  data} value, we use \c{enum QObjectNodeType}:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 3
+
+  Ignore the \c{MetaObjectXXX} values for now. They will be explained
+  in \l{Including The QMetaObject Tree}. Here we are interested in the
+  three node types for QObject nodes: \c{IsQObject}, which represents
+  the element node type for a QObject, and \c{QObjectProperty} and
+  \c{QObjectClassName}, which represent the attribute node types for
+  the attributes of a QObject.
+
+  The \l{QAbstractXmlNodeModel::createIndex()}{createIndex()}
+  function called in the \c{root()} snippet above is the overload that
+  accepts a \c{void*} pointer and a second parameter,
+  \c{additionalData}, with default value 0 (\c{IsQObject}). Wherever
+  you see a call to \l{QAbstractXmlNodeModel::createIndex()}
+  {createIndex()} that only passes the QObject pointer, it is creating
+  the node index for a QObject element node. To create the node index
+  for the class name attribute, for example, the \l{QObject
+  attributes} {attributes()} function uses
+  \c{createIndex(object,QObjectClassName)}.
+
+  \target QObject attributes
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 6
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 8
+
+  \l{QObject attributes} {attributes()} is one of the callback
+  functions you have to implement in your custom node model class. It
+  returns a QVector of \l{QXmlNodeModelIndex} {node indexes} for all
+  the attribute nodes for QObject \c{n}. It calls
+  \l{QAbstractXmlNodeModel::createIndex()} {createIndex()} in two places.
+  Both calls use the QObject pointer from the current node \c{n} (the
+  element node), and just add a different value for the \e{additional data}
+  parameter. This makes sense because, in XML, the attributes of an
+  element are part of that element.
+
+  \section3 Traversing The Node Model
+
+  The query engine traverses the QObject tree by calling back to the
+  node model class's implementation of \l{QObject nextFromSimpleAxis}
+  {nextFromSimpleAxis()}. This function is the heart of the callback
+  interface, and it will probably be the most complex to implement in
+  your custom node model class. Below is a partial listing of the
+  implementation for this example. The full listing will be shown in
+  \l{Including The QMetaObject Tree}, where we discuss traversing the
+  QMetaObject tree.
+
+  \target QObject nextFromSimpleAxis
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 2
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 4
+
+  The main switch uses \c toNodeType(), which obtains the node
+  type from \l{QXmlNodeModelIndex::additionalData()}:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 1
+
+  \c{case IsObject} case is the most interesting. It switches again on
+  the value of the \c{axis} parameter, which specifies the direction
+  the query engine wants to take from the current node. It is one of
+  the four enum values of \l{QAbstractXmlNodeModel::SimpleAxis}.  The
+  \l{QAbstractXmlNodeModel::Parent} {Parent} and
+  \l{QAbstractXmlNodeModel::FirstChild} {FirstChild} cases reduce to
+  calls to QObject::parent() and QObject::children()
+  respectively. Note that a default constructed QXmlNodeModelIndex is
+  returned in the \l{QAbstractXmlNodeModel::Parent} {Parent} case if
+  the current node is the root, and in the
+  \l{QAbstractXmlNodeModel::FirstChild} {FirstChild} case if the
+  current node has no children.
+
+  For the \l{QAbstractXmlNodeModel::NextSibling} {NextSibling} and
+  \l{QAbstractXmlNodeModel::PreviousSibling} {PreviousSibling} axes,
+  the helper function \c{qObjectSibling()} is called, with +1 to
+  traverse to the \l{QAbstractXmlNodeModel::NextSibling} {NextSibling}
+  and -1 to traverse to the
+  \l{QAbstractXmlNodeModel::PreviousSibling} {PreviousSibling}.
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 5
+
+  \c{qObjectSibling()} determines whether or not the node has any
+  siblings. It is called with \c{n}, the index of the current node.
+  If the current node is a child, then it has a parent with children
+  (the current node one of these).
+  So, we get the \l{QObject::parent()}{parent}, obtain the parent's
+  \l{QObject::children()} {child list}, find the current node in the
+  list, and construct the node index for the next or previous child
+  (sibling) and return it.
+
+  \note In \l{QObject nextFromSimpleAxis} {nextFromSimpleAxis()}, the
+  special case of asking for the
+  \l{QAbstractXmlNodeModel::PreviousSibling} {PreviousSibling} of the
+  root node is discussed in \l{Including The QMetaObject Tree}.
+
+  Traversing away from a \c{QObjectClassName} attribute node or a
+  \c{QObjectProperty} attribute node might seem a bit confusing at
+  first glance. The only move allowed from an attribute node is to the
+  \l{QAbstractXmlNodeModel::Parent} {Parent}, because attribute nodes
+  don't have children. But these two cases simply return the
+  \l{QXmlNodeModelIndex} {node index} of the current node.
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 7
+
+  Since \c n is the QXmlNodeModelIndex of the current node, all this
+  does is create another QXmlNodeModelIndex for the current node and
+  return it. This was explained above in \l{Accessing The Node Model},
+  where we saw that each QObject in the node model actually represents
+  an element node and potentially many attribute nodes. Traversing to
+  the parent node of an attribute simply creates a node index for the
+  same QObject, but with an \e{additional data} value of 0
+  (\c{IsQObject}).
+
+  If we only wanted to traverse the QObject tree with XQuery, we could
+  just implement the rest of the virtual callback functions listed
+  earlier and we would be done. The implementations for the remaining
+  functions are straightforward. But if we also want to use XQuery to
+  traverse the QMetaObject tree, we must include the QMetaObject tree
+  in the custom node model.
+
+  \section3 Including The QMetaObject Tree
+
+  The \l{Meta-Object System} {metaobject system} not only enables Qt's
+  \l{Signals and Slots} {signals and slots}, it also provides type
+  information that is useful at run-time; e.g., getting and setting
+  properties without knowing the property names at compile time. Each
+  QObject has an associated QMetaObject tree which contains all this
+  useful type information. Given a QObject, its QMetaObject is
+  obtained with QObject::metaObject(). Then QMetaObject::superClass()
+  can be called repeatedly to get the QMetaObject for each class in the
+  class hierarchy for the original QObject.
+
+  However, the QMetaObject hierarchy is a second tree in a plan that
+  exists logically behind the plane of the QObject tree. The QtXmlPatterns
+  query engine can only traverse a two dimensional node model that
+  represents an XML tree. If we want to include the QMetaObject in the
+  same node model that represents the QObject tree, we must find a way
+  to flatten the QMetaObject tree into the same plane as the QObject
+  tree.
+
+  The node model class declares \l{All MetaObjects}{m_allMetaObjects}
+  as a vector of pointers to QMetaObject:
+
+  \target All MetaObjects
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 1
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h 4
+
+  This vector gets populated by the QObjectXmlModel constructor by
+  calling the private allMetaObjects() function:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 9
+
+  The first half of the function is an example of the standard code
+  pattern for using QtXmlPatterns to run an XQuery. First it creates an
+  instance of QXmlQuery. Then it \l{QXmlQuery::bindVariable()}{binds}
+  the XQuery variable \c{$root} to the root node of the of the node
+  model; i.e., the root of the QObject tree. Then it
+  \l{QXmlQuery::setQuery()} {sets the query} to be an XQuery that
+  returns all the QObjects in the node model. Finally, the query is
+  evaluated into a \l{QXmlResultItems} {result item list}.
+
+  \note \l{QXmlQuery::bindVariable()} must be called before
+  \l{QXmlQuery::setQuery()}, because setting the query causes
+  QtXmlPatterns to \e compile the XQuery, which requires knowledge of
+  the variable bindings.
+
+  The second half of the function traverses the \l{QXmlResultItems}
+  {result item list}, getting the QMetaObject hierarchy for each
+  QObject and appending it to \l{All MetaObjects} {m_allMetaObjects},
+  if it isn't already there. But how do we include this vector of
+  pointers to QMetaObjects in the node model? The key insight is
+  shown in the full listing of \l{Full Listing of nextFromSimpleAxis}
+  {nextFromSimpleAxis()}, where we are interested now in the
+  \c{MetaObjectXXX} cases:
+
+  \target Full Listing of nextFromSimpleAxis
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 2
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 3
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 4
+
+  But first, revisit the \c{PreviousSibling} case for the
+  \c{IsQObject} case:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 10
+
+  When asking for the previous sibling of the root of the QObject
+  tree, it creates a node model index with a null QObject pointer and
+  an \c{additionalData} value of \c{MetaObjects}. This effectively
+  allows the query engine to jump from the QObject tree to the
+  QMetaObject tree.
+
+  The query engine can jump from the QMetaObject tree back to the
+  QObject tree in the \c{NextSibling} case of case \c{MetaObjects},
+  where the \c{root()} function is called:
+
+  \snippet webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp 11
+
+  Having jumped from the QObject tree to the QMetaObject tree, the
+  query engine will use the \c{MetaObject}, \c{MetaObjectClassName},
+  and \c{MetaObjectSuperClass} cases, which are similar to the cases
+  for \c{IsQObject}, \c{QObjectProperty}, and \c{QObjectClassName}.
+*/
diff --git a/examples/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
index ad43284..ad43284 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/forms/mainwindow.ui
diff --git a/examples/xmlpatterns/qobjectxmlmodel/main.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/main.cpp
index 090c14b..04fc523 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/main.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/main.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
index c20e0a4..a456892 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.h
index 8297151..f45df85 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/mainwindow.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/mainwindow.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
index 18aba24..57bd093 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
index 46bf7df..5d7f939 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
new file mode 100644
index 0000000..6ade863
--- /dev/null
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
@@ -0,0 +1,10 @@
+
+FORMS       += forms/mainwindow.ui
+QT +=       xmlpatterns webkitwidgets widgets
+SOURCES     += qobjectxmlmodel.cpp main.cpp mainwindow.cpp xmlsyntaxhighlighter.cpp
+HEADERS     += qobjectxmlmodel.h mainwindow.h xmlsyntaxhighlighter.h
+RESOURCES   = queries.qrc
+
+# install
+target.path = $$[QT_INSTALL_EXAMPLES]/webkitwidgets/xmlpatterns/qobjectxmlmodel
+INSTALLS += target
diff --git a/examples/xmlpatterns/qobjectxmlmodel/queries.qrc b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries.qrc
index ec8cc6b..ec8cc6b 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/queries.qrc
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries.qrc
diff --git a/examples/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
index 14a7a14..14a7a14 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/statisticsInHTML.xq
diff --git a/examples/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq
index 253cd43..253cd43 100644
--- a/examples/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/queries/wholeTree.xq
diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.cpp
index 790a66f..4b15815 100644
--- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.cpp
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.h
index b4fb9dd..72466a2 100644
--- a/examples/xmlpatterns/shared/xmlsyntaxhighlighter.h
+++ b/examples/webkitwidgets/xmlpatterns/qobjectxmlmodel/xmlsyntaxhighlighter.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the examples of the Qt Toolkit.
diff --git a/examples/xmlpatterns/xmlpatterns.pro b/examples/webkitwidgets/xmlpatterns/xmlpatterns.pro
index 4e8c909..4e8c909 100644
--- a/examples/xmlpatterns/xmlpatterns.pro
+++ b/examples/webkitwidgets/xmlpatterns/xmlpatterns.pro
diff --git a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro b/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
deleted file mode 100644
index 77a71d5..0000000
--- a/examples/xmlpatterns/qobjectxmlmodel/qobjectxmlmodel.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-
-FORMS       += forms/mainwindow.ui
-QT +=       xmlpatterns webkitwidgets widgets
-SOURCES     += qobjectxmlmodel.cpp main.cpp mainwindow.cpp ../shared/xmlsyntaxhighlighter.cpp
-HEADERS     += qobjectxmlmodel.h  mainwindow.h ../shared/xmlsyntaxhighlighter.h
-RESOURCES   = queries.qrc
-INCLUDEPATH += ../shared/
-
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/xmlpatterns/qobjectxmlmodel
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xq *.html
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtwebkit-examples-and-demos/xmlpatterns/qobjectxmlmodel
-INSTALLS += target sources
diff --git a/qtwebkit-examples-and-demos.pro b/qtwebkit-examples-and-demos.pro
index 261f484..3d23bb4 100644
--- a/qtwebkit-examples-and-demos.pro
+++ b/qtwebkit-examples-and-demos.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  examples
+SUBDIRS +=  examples doc