summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/declarative/examples.qdoc115
-rw-r--r--doc/src/declarative/pics/ListViewSections.pngbin7596 -> 0 bytes
-rw-r--r--doc/src/declarative/qdeclarativeperformance.qdoc12
-rw-r--r--doc/src/examples/qml-examples.qdoc238
-rw-r--r--doc/src/examples/qml-webbrowser.qdoc52
-rw-r--r--doc/src/images/declarative-folderlistmodel.pngbin17764 -> 14963 bytes
-rw-r--r--doc/src/images/qml-behaviors-example.pngbin0 -> 6367 bytes
-rw-r--r--doc/src/images/qml-borderimage-example.pngbin0 -> 25204 bytes
-rw-r--r--doc/src/images/qml-borderimage-shadows-example.pngbin0 -> 2606 bytes
-rw-r--r--doc/src/images/qml-calculator-example-small.pngbin0 -> 16575 bytes
-rw-r--r--doc/src/images/qml-calculator-example.pngbin33956 -> 33892 bytes
-rw-r--r--doc/src/images/qml-coloranim-example.pngbin0 -> 6184 bytes
-rw-r--r--doc/src/images/qml-dynamicscene-example.pngbin65247 -> 71620 bytes
-rw-r--r--doc/src/images/qml-easing-example.pngbin0 -> 29397 bytes
-rw-r--r--doc/src/images/qml-flickr-demo-small.pngbin0 -> 40934 bytes
-rw-r--r--doc/src/images/qml-focus-example.pngbin26833 -> 43921 bytes
-rw-r--r--doc/src/images/qml-fonts-availableFonts-example.pngbin0 -> 33674 bytes
-rw-r--r--doc/src/images/qml-fonts-banner-example.pngbin0 -> 8502 bytes
-rw-r--r--doc/src/images/qml-fonts-fonts-example.pngbin0 -> 41568 bytes
-rw-r--r--doc/src/images/qml-fonts-hello-example.pngbin0 -> 3213 bytes
-rw-r--r--doc/src/images/qml-gridview-example.pngbin0 -> 24321 bytes
-rw-r--r--doc/src/images/qml-i18n-example.pngbin0 -> 7683 bytes
-rw-r--r--doc/src/images/qml-layoutitem-example.pngbin0 -> 3817 bytes
-rw-r--r--doc/src/images/qml-listview-dynamiclist-example.pngbin0 -> 33091 bytes
-rw-r--r--doc/src/images/qml-listview-expandingdelegates-example.pngbin0 -> 46012 bytes
-rw-r--r--doc/src/images/qml-listview-highlight-example.pngbin0 -> 14216 bytes
-rw-r--r--doc/src/images/qml-listview-highlightranges-example.pngbin0 -> 44290 bytes
-rw-r--r--doc/src/images/qml-listview-sections-example.pngbin0 -> 5491 bytes
-rw-r--r--doc/src/images/qml-minehunt-demo-small.pngbin0 -> 26977 bytes
-rw-r--r--doc/src/images/qml-mousearea-example.pngbin0 -> 5527 bytes
-rw-r--r--doc/src/images/qml-objectlistmodel-example.pngbin0 -> 1618 bytes
-rw-r--r--doc/src/images/qml-package-example.pngbin0 -> 4597 bytes
-rw-r--r--doc/src/images/qml-parallax-example.pngbin0 -> 145854 bytes
-rw-r--r--doc/src/images/qml-photoviewer-demo-small.pngbin0 -> 35633 bytes
-rw-r--r--doc/src/images/qml-plugins-example.pngbin0 -> 15773 bytes
-rw-r--r--doc/src/images/qml-positioners-example.pngbin0 -> 26813 bytes
-rw-r--r--doc/src/images/qml-propertyanim-example.pngbin0 -> 5028 bytes
-rw-r--r--doc/src/images/qml-qgraphicsgridlayout-example.pngbin0 -> 34384 bytes
-rw-r--r--doc/src/images/qml-qgraphicslinearlayout-example.pngbin0 -> 21677 bytes
-rw-r--r--doc/src/images/qml-qwidgets-example.pngbin0 -> 13394 bytes
-rw-r--r--doc/src/images/qml-rssnews-demo-small.pngbin0 -> 19489 bytes
-rw-r--r--doc/src/images/qml-rssnews-demo.pngbin143314 -> 128307 bytes
-rw-r--r--doc/src/images/qml-samegame-demo-small.pngbin0 -> 36596 bytes
-rw-r--r--doc/src/images/qml-samegame-demo.pngbin285415 -> 213137 bytes
-rw-r--r--doc/src/images/qml-scrollbar-example.pngbin0 -> 266986 bytes
-rw-r--r--doc/src/images/qml-snake-demo-small.pngbin0 -> 17895 bytes
-rw-r--r--doc/src/images/qml-states-example.pngbin0 -> 4344 bytes
-rw-r--r--doc/src/images/qml-stringlistmodel-example.pngbin0 -> 1612 bytes
-rw-r--r--doc/src/images/qml-tabwidget-example.pngbin6487 -> 5298 bytes
-rw-r--r--doc/src/images/qml-textselection-example.pngbin0 -> 21889 bytes
-rw-r--r--doc/src/images/qml-transitions-example.pngbin0 -> 4377 bytes
-rw-r--r--doc/src/images/qml-tvtennis-example.pngbin2070 -> 1385 bytes
-rw-r--r--doc/src/images/qml-twitter-demo-small.pngbin0 -> 19807 bytes
-rw-r--r--doc/src/images/qml-visualitemmodel-example.pngbin0 -> 2166 bytes
-rw-r--r--doc/src/images/qml-webbrowser-demo-small.pngbin0 -> 20924 bytes
-rw-r--r--doc/src/images/qml-webbrowser-demo.pngbin0 -> 85107 bytes
-rw-r--r--doc/src/images/qml-webview-alert-example.pngbin0 -> 5417 bytes
-rw-r--r--doc/src/images/qml-webview-autosize-example.pngbin0 -> 11370 bytes
-rw-r--r--doc/src/images/qml-webview-googlemaps-example.pngbin0 -> 133411 bytes
-rw-r--r--doc/src/images/qml-webview-inlinehtml-example.pngbin0 -> 3877 bytes
-rw-r--r--doc/src/images/qml-webview-newwindows-example.pngbin0 -> 6152 bytes
-rw-r--r--doc/src/images/qml-xmlhttprequest-example.pngbin0 -> 21311 bytes
-rw-r--r--doc/src/platforms/compiler-notes.qdoc4
63 files changed, 362 insertions, 59 deletions
diff --git a/doc/src/declarative/examples.qdoc b/doc/src/declarative/examples.qdoc
index 15ee8a4..7b02d33 100644
--- a/doc/src/declarative/examples.qdoc
+++ b/doc/src/declarative/examples.qdoc
@@ -31,34 +31,87 @@
\brief Building UI's with QML
\ingroup all-examples
-\section1 Running the examples
-You can find many simple examples in the \c examples/declarative
-sub-directory that show how to use various aspects of QML. In addition, the
-\c demos/declarative sub-directory contains more sophisticated demos of large
-applications. These demos are intended to show integrated functionality
-rather than being instructive on specific elements.
+Qt includes a set of examples and demos that show how to use various aspects
+of QML. The examples are small demonstrations of particular QML components,
+while the demos contain more complete and functional applications.
To run the examples and demos, you can use Qt Creator or the included \l {Qt Declarative UI Runtime}{qmlviewer}
-command-line application. It has some useful options, revealed by:
+command-line application. For example, from your build directory, run:
\code
- bin/qmlviewer -help
+ bin/qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml
\endcode
-For example, from your build directory, run:
-\code
- bin/qmlviewer $QTDIR/demos/declarative/samegame/samegame.qml
-\endcode
+\section1 Demos
+
+The QML demos integrate a variety of features to demonstrate how QML
+can be used to produce sophisticated interfaces and applications:
+
+
+\table
+\row
+
+\o
+\l{demos/declarative/calculator}{Calculator}
+\image qml-calculator-example-small.png
+
+\o
+\l{demos/declarative/flickr}{Flickr Mobile}
+\image qml-flickr-demo-small.png
+
+\o
+\l{demos/declarative/minehunt}{Minehunt}
+\image qml-minehunt-demo-small.png
+
+\row
+
+\o
+\l{demos/declarative/photoviewer}{Photo Viewer}
+\image qml-photoviewer-demo-small.png
+
+\o
+\l{demos/declarative/rssnews}{RSS News Reader}
+\image qml-rssnews-demo-small.png
+
+\o
+\l{demos/declarative/samegame}{Same Game}
+\image qml-samegame-demo-small.png
+
+\row
+
+\o
+\l{demos/declarative/snake}{Snake}
+\image qml-snake-demo-small.png
+
+\o
+\l{demos/declarative/twitter}{Twitter}
+\image qml-twitter-demo-small.png
+
+\o
+\l{demos/declarative/webbrowser}{Web Browser}
+\image qml-webbrowser-demo-small.png
+
+\endtable
+
+The demos can be found in Qt's \c demos/declarative directory.
+
\section1 Examples
+The QML examples are small, simple applications that show how to use a particular
+QML component or feature. If you are new
+to QML, you may also find the \l{QML Tutorial}{Hello World} and
+\l {QML Advanced Tutorial}{Same Game} tutorials useful.
+
+The examples can be found in Qt's \c examples/declarative directory.
+
\section2 Animation
\list
\o \l{declarative/animation/basics}{Basics}
\o \l{declarative/animation/behaviors}{Behaviors}
-\o \l{declarative/animation/easing}{Easing types}
+\o \l{declarative/animation/easing}{Easing}
\o \l{declarative/animation/states}{States}
\endlist
@@ -68,6 +121,12 @@ For example, from your build directory, run:
\o \l{declarative/imageelements/image}{Image}
\endlist
+\section2 Text
+\list
+\o \l{declarative/text/fonts}{Fonts}
+\o \l{declarative/text/textselection}{Text Selection}
+\endlist
+
\section2 Positioners
\list
\o \l{declarative/positioners}{Example}
@@ -96,6 +155,15 @@ For example, from your build directory, run:
\o \l{declarative/ui-components/tabwidget}{Tab widget}
\endlist
+\section2 Toys
+\list
+\o \l{declarative/toys/clocks}{Clocks}
+\o \l{declarative/toys/corkboards}{Corkboards}
+\o \l{declarative/toys/dynamicscene}{Dynamic Scene}
+\o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
+\o \l{declarative/toys/tvtennis}{TV Tennis}
+\endlist
+
\section2 Models and Views
\list
\o \l{declarative/modelviews/gridview}{GridView}
@@ -139,27 +207,6 @@ For example, from your build directory, run:
\o \l{declarative/cppextensions/networkaccessmanagerfactory}{Network access manager factory}
\endlist
-\section2 Toys
-\list
-\o \l{declarative/toys/clocks}{Clocks}
-\o \l{declarative/toys/corkboards}{Corkboards}
-\o \l{declarative/toys/dynamicscene}{Dynamic Scene}
-\o \l{declarative/toys/tic-tac-toe}{Tic Tac Toe}
-\o \l{declarative/toys/tvtennis}{TV Tennis}
-\endlist
-
-
-\section1 Demos
-
-\list
-\o \l{demos/declarative/calculator}{Calculator}
-\o \l{demos/declarative/flickr}{Flickr Mobile}
-\o \l{demos/declarative/minehunt}{Minehunt}
-\o \l{demos/declarative/photoviewer}{Photo Viewer}
-\o \l{demos/declarative/rssnews}{RSS News Reader}
-\o \l{demos/declarative/samegame}{Same Game}
-\o \l{demos/declarative/snake}{Snake}
-\endlist
\section1 Labs
diff --git a/doc/src/declarative/pics/ListViewSections.png b/doc/src/declarative/pics/ListViewSections.png
deleted file mode 100644
index 9270126..0000000
--- a/doc/src/declarative/pics/ListViewSections.png
+++ /dev/null
Binary files differ
diff --git a/doc/src/declarative/qdeclarativeperformance.qdoc b/doc/src/declarative/qdeclarativeperformance.qdoc
index 1d3e8b7..26c1e89 100644
--- a/doc/src/declarative/qdeclarativeperformance.qdoc
+++ b/doc/src/declarative/qdeclarativeperformance.qdoc
@@ -103,4 +103,16 @@ a Loader as needed.
\o Fast data access - ensure the data model is as fast as possible.
\endlist
+\section1 Image resources over composition
+
+If possible, provide a single image resource, rather than using composition
+of a number of elements. For example, a frame with a shadow could be created using
+a Rectangle placed over an Image providing the shadow. It is more efficient to
+provide an image that includes the frame and the shadow.
+
+\section1 Limit JavaScript
+
+Avoid running JavaScript during animation. For example, running a complex
+JavaScript expression for each frame of an x property animation.
+
*/
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 2e4b882..211ee4b 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -29,7 +29,21 @@
\title Animation: Basics
\example declarative/animation/basics
- This example shows how to create \l{QML Animation}{animations} in QML.
+ This example shows how to create and combine \l{QML Animation}{animations} in QML.
+
+ \table
+ \row
+ \o \image qml-coloranim-example.png
+ \row
+ \o color-animation.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-propertyanim-example.png
+ \row
+ \o property-animation.qml
+ \endtable
*/
/*!
@@ -37,34 +51,69 @@
\example declarative/animation/behaviors
This example shows how to use QML behaviors.
+
+ \image qml-behaviors-example.png
*/
/*!
- \title Animation: Easing types
+ \title Animation: Easing
\example declarative/animation/easing
This example shows the different easing modes available for \l{QML Animation}{animations}.
+
+ \image qml-easing-example.png
*/
/*!
\title Animation: States
\example declarative/animation/states
- This example shows how to use \l{States}{states} and \l{Transitions}{transitions}.
+ These examples show how to use \l{States}{states} and \l{Transitions}{transitions}.
+
+ The \c states.qml example shows how an item can change between states, and \c transitions.qml
+ shows how these state changes can be animated.
+
+ \table
+ \row
+ \o \image qml-states-example.png
+ \row
+ \o states.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-transitions-example.png
+ \row
+ \o transitions.qml
+ \endtable
*/
/*!
\title Image Elements: Border Image
\example declarative/imageelements/borderimage
- This example shows how to use the BorderImage element.
+ These examples show how to use the BorderImage element.
+
+ \table
+ \row
+ \o \image qml-borderimage-example.png
+ \row
+ \o borderimage.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-borderimage-shadows-example.png
+ \row
+ \o shadows.qml
+ \endtable
*/
/*!
\title Image Elements: Image
\example declarative/imageelements/image
- This example shows how to use the Image element and its \l{Image::fillMode}{fillModes}.
+ This example shows how to use the \l Image element and its \l{Image::fillMode}{fillModes}.
\image qml-image-example.png
*/
@@ -102,6 +151,8 @@
\example declarative/cppextensions/plugins
This example shows how to create a C++ plugin extension by subclassing QDeclarativeExtensionPlugin.
+
+ \image qml-plugins-example.png
*/
/*!
@@ -110,6 +161,8 @@
This example show how to use the LayoutItem element to integrate QML items into an existing
\l{Graphics View Framework}{Graphics View}-based application.
+
+ \image qml-layoutitem-example.png
*/
/*!
\title QGraphicsGridLayout
@@ -118,6 +171,8 @@
This example shows how to use QGraphicsGridLayout to lay out QML items. This is
useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with
QML.
+
+ \image qml-qgraphicsgridlayout-example.png
*/
/*!
\title QGraphicsLinearLayout
@@ -126,6 +181,8 @@
This example shows how to use QGraphicsLinearLayout to lay out QML items. This is
useful if you need to integrate Qt \l{Graphics View Framework}{Graphics View} layouts with
QML.
+
+ \image qml-qgraphicslinearlayout-example.png
*/
/*!
\page declarative-cppextensions-qgraphicslayouts.html
@@ -146,6 +203,8 @@
\example declarative/cppextensions/qwidgets
This example shows how to embed QWidget-based objects into QML using QGraphicsProxyWidget.
+
+ \image qml-qwidgets-example.png
*/
/*!
@@ -157,7 +216,7 @@
*/
/*!
- \title C++ Extensions: Network access manager
+ \title C++ Extensions: Network access manager factory
\example declarative/cppextensions/networkaccessmanagerfactory
This example shows how to use QDeclarativeNetworkAccessManagerFactory to create a QNetworkAccessManager
@@ -169,21 +228,25 @@
\example declarative/i18n
This example shows how to enable text translation in QML.
+
+ \image qml-i18n-example.png
*/
/*!
\title Positioners
\example declarative/positioners
- This example shows how to use positioner elements such as Row, Column,
- Grid and Flow.
+ This example shows how to use positioner elements such as \l Row, \l Column,
+ \l Grid and \l Flow.
+
+ \image qml-positioners-example.png
*/
/*!
\title Key Interaction: Focus
\example declarative/keyinteraction/focus
- This example shows how to handle keys and focus in QML.
+ This example shows how to handle keyboard input and focus in QML.
\image qml-focus-example.png
*/
@@ -193,13 +256,50 @@
\example declarative/modelviews/gridview
This example shows how to use the GridView element.
+
+ \image qml-gridview-example.png
*/
/*!
\title Models and Views: ListView
\example declarative/modelviews/listview
- This example shows how to use the ListView element.
+ These examples show how to use the ListView element.
+
+ \table
+ \row
+ \o \image qml-listview-dynamiclist-example.png
+ \row
+ \o dynamiclist.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-listview-expandingdelegates-example.png
+ \row
+ \o expandingdelegates.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-listview-highlight-example.png
+ \row
+ \o highlight.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-listview-highlightranges-example.png
+ \row
+ \o highlightranges.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-listview-sections-example.png
+ \row
+ \o sections.qml
+ \endtable
*/
/*!
@@ -208,13 +308,17 @@
This example shows how to create a C++ extension that exposes a
QList<QObject*> as a model in QML.
+
+ \image qml-objectlistmodel-example.png
*/
/*!
\title Models and Views: Package
\example declarative/modelviews/package
- This example shows how to use the Package element.
+ This example shows how to use the \l Package element.
+
+ \image qml-package-example.png
*/
/*!
@@ -222,6 +326,8 @@
\example declarative/modelviews/parallax
This example shows how to combine and switch between views.
+
+ \image qml-parallax-example.png
*/
/*!
@@ -230,6 +336,8 @@
This example shows how to create a C++ extension that exposes a
QStringList as a model in QML.
+
+ \image qml-stringlistmodel-example.png
*/
/*!
@@ -237,13 +345,50 @@
\example declarative/modelviews/visualitemmodel
This example shows how to use the VisualItemModel element.
+
+ \image qml-visualitemmodel-example.png
*/
/*!
\title Models and Views: WebView
\example declarative/modelviews/webview
- This example shows how to use the WebView element.
+ These examples shows how to use the WebView element.
+
+ \table
+ \row
+ \o \image qml-webview-alert-example.png
+ \row
+ \o alert.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-webview-autosize-example.png
+ \row
+ \o autosize.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-webview-googlemaps-example.png
+ \row
+ \o googlemaps.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-webview-inlinehtml-example.png
+ \row
+ \o inlinehtml.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-webview-newwindows-example.png
+ \row
+ \o newwindows.qml
+ \endtable
*/
/*!
@@ -257,8 +402,46 @@
\title Text: Fonts
\example declarative/text/fonts
- This example shows how to discover available fonts from QML and use
- fonts in different ways.
+ These examples show how to discover available fonts from QML and manipulate
+ text in various ways.
+
+ \table
+ \row
+ \o \image qml-fonts-availableFonts-example.png
+ \row
+ \o availableFonts.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-fonts-banner-example.png
+ \row
+ \o banner.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-fonts-fonts-example.png
+ \row
+ \o fonts.qml
+ \endtable
+
+ \table
+ \row
+ \o \image qml-fonts-hello-example.png
+ \row
+ \o hello.qml
+ \endtable
+*/
+
+/*!
+ \title Text: Text Selection
+ \example declarative/text/textselection
+
+ This example shows how text selection, copy and paste operations
+ can be implemented on top of the TextEdit element.
+
+ \image qml-textselection-example.png
*/
/*!
@@ -336,18 +519,22 @@
*/
/*!
- \title Touch Interaction: Mouse Area
+ \title Touch Interaction: MouseArea
\example declarative/touchinteraction/mousearea
- This example shows how to use the MouseArea element.
+ This example shows how to use the MouseArea element to access information
+ about mouse input.
+
+ \image qml-mousearea-example.png
*/
/*!
\title UI Components: Dial
\example declarative/ui-components/dialcontrol
- This example presents an interactive speedometer-type dial by combining
- \l Image elements with \l Rotation transforms and \l SpringFollow animations.
+ This example shows how to create a dial-type control. It combines
+ \l Image elements with \l Rotation transforms and \l SpringFollow animations
+ to produce an interactive speedometer-type dial.
\image qml-dialcontrol-example.png
*/
@@ -357,7 +544,7 @@
\title UI Components: Flipable
\example declarative/ui-components/flipable
- This example shows how to use the Flipable element.
+ This example shows how to use the \l Flipable element.
\image qml-flipable-example.png
*/
@@ -375,7 +562,7 @@
\title UI Components: Scroll Bar
\example declarative/ui-components/scrollbar
- This example shows how to create scroll bars for a Flickable element
+ This example shows how to create scroll bars for a \l Flickable element
using the \l {Flickable::visibleArea.xPosition}{Flickable::visibleArea}
properties.
@@ -386,7 +573,8 @@
\title UI Components: Search Box
\example declarative/ui-components/searchbox
- This example shows how to create a search box.
+ This example shows how to combine TextInput, FocusScope and BorderImage
+ elements to display multiple text input fields.
\image qml-searchbox-example.png
*/
@@ -395,7 +583,7 @@
\title UI Components: Slide Switch
\example declarative/ui-components/slideswitch
- This example shows how to create a slide switch.
+ This example shows how to create a slide switch control.
\image qml-slideswitch-example.png
*/
@@ -404,7 +592,7 @@
\title UI Components: Spinner
\example declarative/ui-components/spinner
- This example shows how to create a spinner-type component.
+ This example shows how to create a spinner-type component using the PathView element.
\image qml-spinner-example.png
*/
@@ -422,5 +610,7 @@
\title XML: XMLHttpRequest
\example declarative/xml/xmlhttprequest
- This example shows how to use \l XmlHttpRequest in QML.
+ This example shows how to use the \l XmlHttpRequest API in QML.
+
+ \image qml-xmlhttprequest-example.png
*/
diff --git a/doc/src/examples/qml-webbrowser.qdoc b/doc/src/examples/qml-webbrowser.qdoc
new file mode 100644
index 0000000..da6f600
--- /dev/null
+++ b/doc/src/examples/qml-webbrowser.qdoc
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \title Web Browser
+ \example demos/declarative/webbrowser
+
+ This demo shows how to write a simple web browser in QML by combining the
+ WebView element with other components including scroll bars,
+ \l Flickable views and TextInput fields.
+
+ \image qml-webbrowser-demo.png
+*/
+
diff --git a/doc/src/images/declarative-folderlistmodel.png b/doc/src/images/declarative-folderlistmodel.png
index a469f96..fbed4f8 100644
--- a/doc/src/images/declarative-folderlistmodel.png
+++ b/doc/src/images/declarative-folderlistmodel.png
Binary files differ
diff --git a/doc/src/images/qml-behaviors-example.png b/doc/src/images/qml-behaviors-example.png
new file mode 100644
index 0000000..aee5c2b
--- /dev/null
+++ b/doc/src/images/qml-behaviors-example.png
Binary files differ
diff --git a/doc/src/images/qml-borderimage-example.png b/doc/src/images/qml-borderimage-example.png
new file mode 100644
index 0000000..7e488f2
--- /dev/null
+++ b/doc/src/images/qml-borderimage-example.png
Binary files differ
diff --git a/doc/src/images/qml-borderimage-shadows-example.png b/doc/src/images/qml-borderimage-shadows-example.png
new file mode 100644
index 0000000..4700868
--- /dev/null
+++ b/doc/src/images/qml-borderimage-shadows-example.png
Binary files differ
diff --git a/doc/src/images/qml-calculator-example-small.png b/doc/src/images/qml-calculator-example-small.png
new file mode 100644
index 0000000..9e0370f
--- /dev/null
+++ b/doc/src/images/qml-calculator-example-small.png
Binary files differ
diff --git a/doc/src/images/qml-calculator-example.png b/doc/src/images/qml-calculator-example.png
index 19ce1b6..0f9ced8 100644
--- a/doc/src/images/qml-calculator-example.png
+++ b/doc/src/images/qml-calculator-example.png
Binary files differ
diff --git a/doc/src/images/qml-coloranim-example.png b/doc/src/images/qml-coloranim-example.png
new file mode 100644
index 0000000..12edc99
--- /dev/null
+++ b/doc/src/images/qml-coloranim-example.png
Binary files differ
diff --git a/doc/src/images/qml-dynamicscene-example.png b/doc/src/images/qml-dynamicscene-example.png
index 1f725d1..4179ebe 100644
--- a/doc/src/images/qml-dynamicscene-example.png
+++ b/doc/src/images/qml-dynamicscene-example.png
Binary files differ
diff --git a/doc/src/images/qml-easing-example.png b/doc/src/images/qml-easing-example.png
new file mode 100644
index 0000000..fef5b70
--- /dev/null
+++ b/doc/src/images/qml-easing-example.png
Binary files differ
diff --git a/doc/src/images/qml-flickr-demo-small.png b/doc/src/images/qml-flickr-demo-small.png
new file mode 100644
index 0000000..370ffcf
--- /dev/null
+++ b/doc/src/images/qml-flickr-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-focus-example.png b/doc/src/images/qml-focus-example.png
index 5a114a0..0ec2bff 100644
--- a/doc/src/images/qml-focus-example.png
+++ b/doc/src/images/qml-focus-example.png
Binary files differ
diff --git a/doc/src/images/qml-fonts-availableFonts-example.png b/doc/src/images/qml-fonts-availableFonts-example.png
new file mode 100644
index 0000000..4d8440c
--- /dev/null
+++ b/doc/src/images/qml-fonts-availableFonts-example.png
Binary files differ
diff --git a/doc/src/images/qml-fonts-banner-example.png b/doc/src/images/qml-fonts-banner-example.png
new file mode 100644
index 0000000..b415161
--- /dev/null
+++ b/doc/src/images/qml-fonts-banner-example.png
Binary files differ
diff --git a/doc/src/images/qml-fonts-fonts-example.png b/doc/src/images/qml-fonts-fonts-example.png
new file mode 100644
index 0000000..4481397
--- /dev/null
+++ b/doc/src/images/qml-fonts-fonts-example.png
Binary files differ
diff --git a/doc/src/images/qml-fonts-hello-example.png b/doc/src/images/qml-fonts-hello-example.png
new file mode 100644
index 0000000..18da867
--- /dev/null
+++ b/doc/src/images/qml-fonts-hello-example.png
Binary files differ
diff --git a/doc/src/images/qml-gridview-example.png b/doc/src/images/qml-gridview-example.png
new file mode 100644
index 0000000..8a092b5
--- /dev/null
+++ b/doc/src/images/qml-gridview-example.png
Binary files differ
diff --git a/doc/src/images/qml-i18n-example.png b/doc/src/images/qml-i18n-example.png
new file mode 100644
index 0000000..8e734ea
--- /dev/null
+++ b/doc/src/images/qml-i18n-example.png
Binary files differ
diff --git a/doc/src/images/qml-layoutitem-example.png b/doc/src/images/qml-layoutitem-example.png
new file mode 100644
index 0000000..b3c778a
--- /dev/null
+++ b/doc/src/images/qml-layoutitem-example.png
Binary files differ
diff --git a/doc/src/images/qml-listview-dynamiclist-example.png b/doc/src/images/qml-listview-dynamiclist-example.png
new file mode 100644
index 0000000..6acc3d9
--- /dev/null
+++ b/doc/src/images/qml-listview-dynamiclist-example.png
Binary files differ
diff --git a/doc/src/images/qml-listview-expandingdelegates-example.png b/doc/src/images/qml-listview-expandingdelegates-example.png
new file mode 100644
index 0000000..e7ffc33
--- /dev/null
+++ b/doc/src/images/qml-listview-expandingdelegates-example.png
Binary files differ
diff --git a/doc/src/images/qml-listview-highlight-example.png b/doc/src/images/qml-listview-highlight-example.png
new file mode 100644
index 0000000..4f95c13
--- /dev/null
+++ b/doc/src/images/qml-listview-highlight-example.png
Binary files differ
diff --git a/doc/src/images/qml-listview-highlightranges-example.png b/doc/src/images/qml-listview-highlightranges-example.png
new file mode 100644
index 0000000..f499caa
--- /dev/null
+++ b/doc/src/images/qml-listview-highlightranges-example.png
Binary files differ
diff --git a/doc/src/images/qml-listview-sections-example.png b/doc/src/images/qml-listview-sections-example.png
new file mode 100644
index 0000000..4e8f076
--- /dev/null
+++ b/doc/src/images/qml-listview-sections-example.png
Binary files differ
diff --git a/doc/src/images/qml-minehunt-demo-small.png b/doc/src/images/qml-minehunt-demo-small.png
new file mode 100644
index 0000000..e5badac
--- /dev/null
+++ b/doc/src/images/qml-minehunt-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-mousearea-example.png b/doc/src/images/qml-mousearea-example.png
new file mode 100644
index 0000000..c6e52d6
--- /dev/null
+++ b/doc/src/images/qml-mousearea-example.png
Binary files differ
diff --git a/doc/src/images/qml-objectlistmodel-example.png b/doc/src/images/qml-objectlistmodel-example.png
new file mode 100644
index 0000000..c0fc490
--- /dev/null
+++ b/doc/src/images/qml-objectlistmodel-example.png
Binary files differ
diff --git a/doc/src/images/qml-package-example.png b/doc/src/images/qml-package-example.png
new file mode 100644
index 0000000..f7749aa
--- /dev/null
+++ b/doc/src/images/qml-package-example.png
Binary files differ
diff --git a/doc/src/images/qml-parallax-example.png b/doc/src/images/qml-parallax-example.png
new file mode 100644
index 0000000..2df52ed
--- /dev/null
+++ b/doc/src/images/qml-parallax-example.png
Binary files differ
diff --git a/doc/src/images/qml-photoviewer-demo-small.png b/doc/src/images/qml-photoviewer-demo-small.png
new file mode 100644
index 0000000..b16fb4e
--- /dev/null
+++ b/doc/src/images/qml-photoviewer-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-plugins-example.png b/doc/src/images/qml-plugins-example.png
new file mode 100644
index 0000000..c2d4886
--- /dev/null
+++ b/doc/src/images/qml-plugins-example.png
Binary files differ
diff --git a/doc/src/images/qml-positioners-example.png b/doc/src/images/qml-positioners-example.png
new file mode 100644
index 0000000..721c1b3
--- /dev/null
+++ b/doc/src/images/qml-positioners-example.png
Binary files differ
diff --git a/doc/src/images/qml-propertyanim-example.png b/doc/src/images/qml-propertyanim-example.png
new file mode 100644
index 0000000..46efc64
--- /dev/null
+++ b/doc/src/images/qml-propertyanim-example.png
Binary files differ
diff --git a/doc/src/images/qml-qgraphicsgridlayout-example.png b/doc/src/images/qml-qgraphicsgridlayout-example.png
new file mode 100644
index 0000000..1a3bd47
--- /dev/null
+++ b/doc/src/images/qml-qgraphicsgridlayout-example.png
Binary files differ
diff --git a/doc/src/images/qml-qgraphicslinearlayout-example.png b/doc/src/images/qml-qgraphicslinearlayout-example.png
new file mode 100644
index 0000000..3964f5b
--- /dev/null
+++ b/doc/src/images/qml-qgraphicslinearlayout-example.png
Binary files differ
diff --git a/doc/src/images/qml-qwidgets-example.png b/doc/src/images/qml-qwidgets-example.png
new file mode 100644
index 0000000..262b3df
--- /dev/null
+++ b/doc/src/images/qml-qwidgets-example.png
Binary files differ
diff --git a/doc/src/images/qml-rssnews-demo-small.png b/doc/src/images/qml-rssnews-demo-small.png
new file mode 100644
index 0000000..451a420
--- /dev/null
+++ b/doc/src/images/qml-rssnews-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-rssnews-demo.png b/doc/src/images/qml-rssnews-demo.png
index 948ef4d..b4143b4 100644
--- a/doc/src/images/qml-rssnews-demo.png
+++ b/doc/src/images/qml-rssnews-demo.png
Binary files differ
diff --git a/doc/src/images/qml-samegame-demo-small.png b/doc/src/images/qml-samegame-demo-small.png
new file mode 100644
index 0000000..ec9ad76
--- /dev/null
+++ b/doc/src/images/qml-samegame-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-samegame-demo.png b/doc/src/images/qml-samegame-demo.png
index c17b4e0..945f2b9 100644
--- a/doc/src/images/qml-samegame-demo.png
+++ b/doc/src/images/qml-samegame-demo.png
Binary files differ
diff --git a/doc/src/images/qml-scrollbar-example.png b/doc/src/images/qml-scrollbar-example.png
new file mode 100644
index 0000000..4cf7c2c
--- /dev/null
+++ b/doc/src/images/qml-scrollbar-example.png
Binary files differ
diff --git a/doc/src/images/qml-snake-demo-small.png b/doc/src/images/qml-snake-demo-small.png
new file mode 100644
index 0000000..23a7b3b
--- /dev/null
+++ b/doc/src/images/qml-snake-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-states-example.png b/doc/src/images/qml-states-example.png
new file mode 100644
index 0000000..30514ec
--- /dev/null
+++ b/doc/src/images/qml-states-example.png
Binary files differ
diff --git a/doc/src/images/qml-stringlistmodel-example.png b/doc/src/images/qml-stringlistmodel-example.png
new file mode 100644
index 0000000..c8c888b
--- /dev/null
+++ b/doc/src/images/qml-stringlistmodel-example.png
Binary files differ
diff --git a/doc/src/images/qml-tabwidget-example.png b/doc/src/images/qml-tabwidget-example.png
index 05887f3..847052d 100644
--- a/doc/src/images/qml-tabwidget-example.png
+++ b/doc/src/images/qml-tabwidget-example.png
Binary files differ
diff --git a/doc/src/images/qml-textselection-example.png b/doc/src/images/qml-textselection-example.png
new file mode 100644
index 0000000..284ef53
--- /dev/null
+++ b/doc/src/images/qml-textselection-example.png
Binary files differ
diff --git a/doc/src/images/qml-transitions-example.png b/doc/src/images/qml-transitions-example.png
new file mode 100644
index 0000000..8656bfe
--- /dev/null
+++ b/doc/src/images/qml-transitions-example.png
Binary files differ
diff --git a/doc/src/images/qml-tvtennis-example.png b/doc/src/images/qml-tvtennis-example.png
index ac2b527..1a38034 100644
--- a/doc/src/images/qml-tvtennis-example.png
+++ b/doc/src/images/qml-tvtennis-example.png
Binary files differ
diff --git a/doc/src/images/qml-twitter-demo-small.png b/doc/src/images/qml-twitter-demo-small.png
new file mode 100644
index 0000000..b55ceba
--- /dev/null
+++ b/doc/src/images/qml-twitter-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-visualitemmodel-example.png b/doc/src/images/qml-visualitemmodel-example.png
new file mode 100644
index 0000000..c716a59
--- /dev/null
+++ b/doc/src/images/qml-visualitemmodel-example.png
Binary files differ
diff --git a/doc/src/images/qml-webbrowser-demo-small.png b/doc/src/images/qml-webbrowser-demo-small.png
new file mode 100644
index 0000000..6c5d57d
--- /dev/null
+++ b/doc/src/images/qml-webbrowser-demo-small.png
Binary files differ
diff --git a/doc/src/images/qml-webbrowser-demo.png b/doc/src/images/qml-webbrowser-demo.png
new file mode 100644
index 0000000..9ff471e
--- /dev/null
+++ b/doc/src/images/qml-webbrowser-demo.png
Binary files differ
diff --git a/doc/src/images/qml-webview-alert-example.png b/doc/src/images/qml-webview-alert-example.png
new file mode 100644
index 0000000..c1cddce
--- /dev/null
+++ b/doc/src/images/qml-webview-alert-example.png
Binary files differ
diff --git a/doc/src/images/qml-webview-autosize-example.png b/doc/src/images/qml-webview-autosize-example.png
new file mode 100644
index 0000000..5cec614
--- /dev/null
+++ b/doc/src/images/qml-webview-autosize-example.png
Binary files differ
diff --git a/doc/src/images/qml-webview-googlemaps-example.png b/doc/src/images/qml-webview-googlemaps-example.png
new file mode 100644
index 0000000..d6c77a1
--- /dev/null
+++ b/doc/src/images/qml-webview-googlemaps-example.png
Binary files differ
diff --git a/doc/src/images/qml-webview-inlinehtml-example.png b/doc/src/images/qml-webview-inlinehtml-example.png
new file mode 100644
index 0000000..426cf8a
--- /dev/null
+++ b/doc/src/images/qml-webview-inlinehtml-example.png
Binary files differ
diff --git a/doc/src/images/qml-webview-newwindows-example.png b/doc/src/images/qml-webview-newwindows-example.png
new file mode 100644
index 0000000..bd98b57
--- /dev/null
+++ b/doc/src/images/qml-webview-newwindows-example.png
Binary files differ
diff --git a/doc/src/images/qml-xmlhttprequest-example.png b/doc/src/images/qml-xmlhttprequest-example.png
new file mode 100644
index 0000000..68e7d27
--- /dev/null
+++ b/doc/src/images/qml-xmlhttprequest-example.png
Binary files differ
diff --git a/doc/src/platforms/compiler-notes.qdoc b/doc/src/platforms/compiler-notes.qdoc
index c365d88..7eb92e0 100644
--- a/doc/src/platforms/compiler-notes.qdoc
+++ b/doc/src/platforms/compiler-notes.qdoc
@@ -52,7 +52,7 @@
\table
\header \o Compiler \o{5,1} Features
- \header \o \o Concurrent \o XmlPatterns \o WebKit \o CLucene \o Phonon
+ \header \o \o Concurrent \o XmlPatterns \o WebKit(*) \o CLucene \o Phonon
\row \o g++ 3.3 \o \o \bold{X} \o \o \bold{X} \o \bold{X}
\row \o g++ 3.4 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X}
\row
@@ -67,6 +67,8 @@
\row \o MSVC 2005 and up \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X} \o \bold{X}
\endtable
+ * WebKit is only supported as a dynamically built library. Static linkage is not supported.
+
\target GCC
\section1 GCC